add error-checking
Merge branches 'master' and 'master' of https://github.com/rcoffey/hubway

Conflicts:
	src/main/java/hubway/MongoStationPair.java
Merge branch 'master' of https://github.com/rcoffey/hubway
Merge branch 'master' of https://github.com/rcoffey/hubway
Merge branch 'master' of https://github.com/rcoffey/hubway