Making sure ENV doesn't need to be used all the time
Switched Travis CI and Code Climate badges over to new org setup
Resolving merge conflicts

https://app.asana.com/0/11389918903342/11389918903370