Add test for resolved deps, #214.
Fix the way errors are thrown in tests.
Finish up conflict resolution logic, #214.

Some refactoring.
Merge branch 'master' of github.com:twitter/bower
Use the original tags if defined in the conflict resolution messages, #214.