Got layout working properly with index and about
Merge branch 'master' of github.com:OpenTreeOfLife/opentree

Conflicts:
	webapp/views/default/index.html
	webapp/views/layout.html