Update location and contact info
Merge pull request #2 from lukehoban/master

Update location and contact info