Add cleanup task for extra files installed by bower
Update README
Update changelog
fix merge conflicts