First Slim commit
Biiiiiiiig cleanup.
Merge branch 'Slim'

Conflicts:
	public/js/vendor/jquery-1.9.1.min.js