Merge branch 'master' of https://github.com/jerturowetz/_launchy
Merge branch 'master' into jackbranding