Merge branch 'local-hostname-conf' of https://github.com/yieldbot/storm into STORM-546-V1