Switched to Jekyll Bootstrap
Fixed permalinks
Merge branch 'jekyll_bootstrap'

Conflicts:
	_config.yml