Fix .bowerrc "json" key to "bower.json"
Merge branch 'themes'