Merge pull request #39 from tbuchanan/master

mostly css changes and heroku bug fixes
Merge pull request #40 from tbuchanan/master

fixed devise
stuff