rollback due to error
Revert "rollback due to error"

This reverts commit b50932d860d638f1f5b484fd29f1648ac0e4c903.
Merge branch 'nightly' of https://github.com/adamldavid/citibike_aggregator into nightly