Moving over to jekyll-assets instead of Codekit. The icon font isn't working yet
Adding icon-font to assets
Adding gZip css
Updating sitemap and feed
Merge remote-tracking branch 'origin/master' into 7-move-over-to-jekyll-assets-for-compiling

Conflicts:
	_site/assets/css/global.css
	_site/feed.xml
	_site/sitemap.xml
	assets/css/global.css
Merge branch '7-move-over-to-jekyll-assets-for-compiling'

Conflicts:
	_site/feed.xml
	_site/sitemap.xml