Merge branch 'refs/heads/gh-pages'
Indentation
add testing when running on localhost or IP address
disqus is on but is broken
complete merge\