Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
move non-theme styles to external stylesheet,

update styles, add new link to stylesheet
Merge branch 'gh-pages'