removes ghost stuff in views.
Merge branch 'master' into restructure

Conflicts:
	views/default.hbs