Merge branch 'master' of https://github.com/rcoffey/hubway

Conflicts:
	src/main/java/hubway/LocationDataEnricher.java
	src/main/java/hubway/galaway.java