updates
Merge branch 'master' of github.com:jtraver/dev