[2.1.0] Clean up URLs
Merge branch 'gh-pages' of github.com:errinlarsen/castle_greyhawk into gh-pages