Merge pull request #1 from alexwpotter/master

Let's merge this F#!%cker
Merge pull request #2 from alexwpotter/deploy

Merge pull request #1 from alexwpotter/master