Add compass as well, breaking on heroku
Merge branch 'master' of https://github.com/jamesdphillips/ml-staffer

# By James Phillips (2) and others
# Via Moeed Mohammad
* 'master' of https://github.com/jamesdphillips/ml-staffer:
  hoot
  Fix a conflict with location_update
  Fix merge fail
  Facebook authentication
Update from campfire
Merge branch 'master' of https://github.com/jamesdphillips/ml-staffer

# By Billy He (1) and Moeed Mohammad (1)
# Via Moeed Mohammad
* 'master' of https://github.com/jamesdphillips/ml-staffer:
  BAM
  Add facebook checkin