deploy stuff cleanup
Merge branch 'master' of github.com:mmay/todo

Conflicts:
	Gemfile
	Gemfile.lock