Fixing various things ...
Merge branch 'gh-pages' of http://github.com/sinak/DefundTheNSA into gh-pages