Merge branch 'peteschaffner-update/icons'
Merge branch 'master' of https://github.com/gillibrand/launchbar-pinboard