Misc. improvements

See Asana
Merge branch 'master' of https://github.com/mindsharestudios/blankout

Conflicts:
	functions.php