Adding Graeme Tait
Merge pull request #7 from burriko/master

Adding Graeme Tait
Merge pull request #6 from gotbadger/master

JS Refactor for fun
Merge pull request #2 from coldclimate/master

upstream merge