Urgent fix for a badly resolved conflict.
Merge branches 'master' and 'master' of github.com:bower/bower
Update change log.
Bump version.