Merge pull request #1 from steve8/master

Commit of rails codebase
Merge pull request #2 from steve8/landing_page

adds index.html
organizes and simplifies acceptance tests

switches more email language to username
changes deploy.rb server parameter to localhost, not sure why I set it
to my home server/router's local ip.
adds organizes acceptance tests and helpers so that they're not loaded
for other tests.
Merge branch 'master' of https://github.com/meesterdude/softandfluffynotes into authentication
improved specificity of deploy.md and reference config/deploy.rb