add home link
Merge remote-tracking branch 'upstream/release-1' into release-1
fix notice merge conflict
Remove filler text
Merge and delete plain html files
Add mandrill keys
Add host param for email
change from in registration mailer
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge branch 'master' into release-1
Add dropbox settings
Merge gemfile conflicts
Merge remote-tracking branch 'upstream/release-1'
comment out validations, dropbox settings
Remove unused models
Remove an old merge conflict
Remove dragonfly development folder
Merge pull request #93 from dazm12/release-1

Add dropbox, fix some old changes