Revert "A truly unregulated commit, devoid of all types of workflow"

This reverts commit 6a0787817fb09a0c90a294fe055c21d2692a2fbc.
Merge branch 'reverting'

Conflicts:
	views/the_root_of_all_evil.haml
Merge branch 'master' into reverting