Merge pull request #1 from daveology/master

Pull Request #1
Merge pull request #2 from daveology/master

Pull Request #2
Revert "Pull Request #2"
Merge pull request #3 from daveology/revert-2-master

Revert "Pull Request #2"
Merge pull request #4 from daveology/gh-pages

Master - gh-pages Pull Request #1