Merged Jekyllbootstrap. Updated gitignore and site config.