refactored checkin controller some more
Merge branch 'master' of https://github.com/ehanderson/Marketing

mergin with emily's changes