Merge branch 'master' of https://github.com/box-and-whisker/www
Add contact info, tweak CSS