Place devise token in ENV
Merge branch 'bug/remove_key_20130525' into develop
Merge branch 'develop'