Merge branch 'master' of github.com:iamcam/Blast-Off
Not interested in pursuing Grape for the API right now