Merge branch 'master' of https://github.com/spendless/spendless

Conflicts:
spendless/Gemfile.lock
spendless/config/secrets.yml
starting over with pg db rails app and will add from old as needed