commit before pull
Merge branch 'master' of https://github.com/cicadas-2014/percolator into improvements
Merge branch 'master' of https://github.com/cicadas-2014/percolator into improvements
fixed disqus and merge conflicts
Merge pull request #58 from mcclungt/improvements

fixed disqus and whatnot