Merge branch 'develop' of https://github.com/madcowfred/evething into develop

Conflicts:
	Makefile
	evething/settings.py
	static/css/theme-cerulean.min.css
	static/css/theme-cosmo.min.css
	static/css/theme-cyborg.min.css
	static/css/theme-darkthing.min.css
	static/css/theme-default.min.css
	static/css/theme-slate.min.css
	static/js/evething-combined.min.js
	static/js/evething/home.js
	static/js/templates.js
	templates/thing/account.html
	templates/thing/home.html
	thing/models/userprofile.py
	thing/views/account.py
	thing/views/home.py