Moving stuff
Resolving conflicts
Merge branch 'master' of https://github.com/airbrite/airbrite-api