Merge pull request #3 from jimmynotjim/dev

Dev looks ready, but I'm sure I've missed something
Merge branch 'refs/heads/master' into gh-pages
Adding custom domain