213 change location email

Rebased version of #236, ready to merge into rails-3.2