Update documentation
Update documentation
Update documentation
Merge pull request #1 from macrojc/master

merged with master
Update documentation
Update documentation
Update documentation
Update documentation
Update documentation
Update documentation
changes to output
Merge branch 'gh-pages'

Conflicts:
	README.md
	index.html
	output/archives.html
	output/author/april-wright.html
	output/authors.html
	output/categories.html
	output/feeds/all.atom.xml
	output/tag/blogstuff.html
	output/tags.html
	tag/papers.html