Various updates
Merge branch 'master' of https://github.com/robertbrodrecht/launchpad