comments and formatting
Merge branch 'master' of ssh://github.com/openplans/OpenTripPlanner
KV8updater: Switch from zeromq JNI to jeromq
Merge remote-tracking branch 'origin/master' into zmqUpdateStreamer

Conflicts:
	opentripplanner-updater/src/main/java/org/opentripplanner/updater/stoptime/KV8ZMQUpdateStreamer.java
uncomment jermq maven dependency
Merge pull request #978 from benmoovit/master

fix some bugs