add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match
Merge pull request #1239 from ethomson/index_remove

add an index_remove_bypath that removes conflicts
Fix linking error caused by ddcb28a41f3774e26fc6ae0a7174a5565e4749ce.
Merge pull request #1258 from zcbenz/fix_index_remove_test

Fix linking error caused by ddcb28a41f3774e26fc6ae0a7174a5565e4749ce.