Merge pull request #1 from evildmp/master

merging upstream
Merge pull request #2 from evildmp/master

merging upstream
addition of twitter handle and github account
Merge pull request #290 from glen442/amend-my-name

Amend my name - adding twitter handle and github URL