Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Added standalone function to allow for ajax calls
Removed ajax html, loading index instead
Merge branch 'gh-pages'