cleanup
Merge branch 'cleanup/major'

Conflicts:
	README.md
bump
Merge branch 'master' of github.com:karlfreeman/middleman-deploy