Merge pull request #460 from gvwilson/gh-pages

Merging all changes done since November 2013 tag.