A few local updates
Merge branch 'master' of github.com:craigprotzel/Mashups