sync imac with mbp changes over weekend?
Interlude changes for registration, email permissions, and styling.
revise devise.rb
Merge branch 'master' of https://github.com/bozcotty/bloccit
Merge branch 'master' of https://github.com/bozcotty/bloccit