idea stuff
Switched back to jekyll
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
	package.json
Removed assemble.io stuff