update readme, prune bower
Merge branch 'dev'