notices and errors
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
removes mistaken password migrations:
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog into lisa
manually updates files to deal with conflicts
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
Merge branch 'master' into lisa
recreates add password digest migration
Merge pull request #105 from lisavogtsf/lisa

Fixes my problems--only actual changes are formatting, indentation maybe

Yay!