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