Merge branch 'master' into api_change
add operator/ to PropPath and move its implementation to propmap.cpp
clang cleanup
Merge branch 'master' into api_change
Merge branch 'api_change' of github.com:DerOrfa/isis into api_change