Starting over.
Merge branch 'master' of github.com:zencephalon/prosedy

Conflicts:
	Gemfile.lock
	public/js/dd/deftdraft.js
	views/deftdraft.liquid
Remove this stuff too