Misc content for main, footer
Merge branch 'master' into content
Add contact info
Remove whitespace
Misc refactorings, fixes
Merge pull request #19 from rogerhutchings/content

Content