clean up and formatting
Merge branch 'master' of https://github.com/rcoffey/hubway

Conflicts:
	src/main/java/hubway/utility/Calculator.java