Fixes to bootstrap for bower
Merge README