mjk
Merge pull request #274 from extremezoo/Everett's-branch(6/5/14)

mjk
Merge pull request #275 from extremezoo/master

updating site