Added tests for bower.json files located in other dirs
Added fix for including "self-mains" from bower.json files located in other dirs