Cleanup URLs and config
Merge branch 'master' of https://renyedi@github.com/eBay/ostara.git