Added collections and layouts
Merge branch 'gh-pages' of github.com:AllenWrenches/jekyll into gh-pages