Address comments with luke
Merge branch 'feature/ns_ts_removal' of github.com:sailthru/mongo-connector into feature/ns_ts_removal