merge complete
updating local copy
Merge pull request #132 from cycomachead/gh-pages

Merging fixes from various old PR's.