updated author info
Merge branch 'master' of https://github.com/awesomephant/boilerplate