Generating documentation
Merge branch 'master' into gh-pages

Conflicts:
	public/fonts/Makefile
Generating documentation
testing make docsMerge branch 'master' into gh-pages
changed documentation layout to linear
Merge branch 'master' into gh-pages
fixing make docs
Merge branch 'master' into gh-pages
changing branch/dir struction, per https://gist.github.com/chrisjacob/833223