Cleaned up indentation/spacing
Merge branch 'master' of https://github.com/markwilliams970/Flowdock-puma
Minor cleanup