fixed urls and selection site
Merge branch 'master' of github.com:schneith/caffeine