minor cleanup
Merge branch 'api_change' into c++11
Merge branch 'c++11' of github.com:DerOrfa/isis into c++11