heroku build
Merge branch 'dev' of github.com:GoOutside/master into dev
heroku build2
https became http
add travis badge
Merge pull request #15 from GoOutside/dev

Dev
Merge branch 'master' of github.com:GoOutside/master
Merge branch 'master' of github.com:GoOutside/master into dev
updating mongo info for heroku
fixed merge conflict with server.js
updated to http
fixed ajax path
rebuilt
updated .gitignore
updating user controller for jwt auth
added jwt auth to activities controller