Merging master w/ gh-pages

Just making some simple changes!