Resolving conflict
resolving conflicts in duplicate removal in orocos_use_package
Merge pull request #17 from jhu-lcsr-forks/remove_duplicates_from_use_orocos_variables-updated

Removing duplicates, with merged conflicts