lot done, auto collab list, etc

Signed-off-by: franszo <josh@kishandchips.com>
Merge branch 'master' of github.com:kishandchips/epigeum

Signed-off-by: franszo <josh@kishandchips.com>

Conflicts:
	config.codekit
	css/scss/_modules.scss
	css/scss/_templates.scss
	css/style.css
	functions.php
	inc/footer-content.php
	inc/header-content.php
	inc/layouts/call-to-action.php
	inc/layouts/events.php
	js/main.js
	page.php
Merge

Signed-off-by: franszo <josh@kishandchips.com>