Merge pull request #2 from notwaldorf/master

merge master into into gh-pages
Link to Google instead of Notman House
Replace February hack night with TBA
Fix merge conflict