updates
Merge branch 'master' of https://github.com/pflynny/starter-kit