Adding in fixes found through trobuleshooting
adapter changes from Tim
Adding OSX metadata to list of ignored files
Adding configurable COP mode to connection
Rebuilt java jar
Removing unnecessary insert methods
Merge branch 'cop_mode'
Merge branch 'from_upstream'
Merge fix