Moved Pony options to config file, added option to use single address for outgoing mail, when mail server permissions make it necessary.
Updated Vagrant deploy target to set Pony mail options; use separate config constants for outgoing mail addresses.
Accidentally disabled readonly demo mode in default environment.rb; reverse it.
add login column, and use it on signin instead of email
make users.email editable at user settings
Merge branch 'login-email'
Merge remote-tracking branch 'michaelstorm/master'

Conflicts:
	lib/emails.rb