Fix resolution of bower packages, use bower:install:deployment rake task, to skip generating a new bower.json and redoing the conflict resolution.