Moved changes from master branch over.
Changed slide order slightly.
Merged changes from gh-pages branch.