refactors account controller test and account model for authentication and confirmation
deletes commented out line
Resolving merge conflicts
Merge pull request #31 from banana-slugs-2014/accounts

Refactor