Merge branch 'dev' into spiceit

.gitignore

isis/make/config.darwin-MacOSX10_11

isis/make/config.linux-x86_32

isis/make/config.linux-x86_64

isis/make/config.linux-x86_64_Debian8

isis/make/config.linux-x86_64_Fedora21

isis/make/config.linux-x86_64_Fedora25

isis/make/config.linux-x86_64_Ubuntu14_04

isis/src/base/apps/ddd2isis/ddd2isis.cpp

isis/src/base/apps/ddd2isis/ddd2isis.xml

isis/src/base/apps/ddd2isis/tsts/default/Makefile

isis/src/base/apps/ddd2isis/tsts/errors/Makefile

isis/src/base/apps/dsk2isis/dsk2isis.xml

isis/src/control/apps/cnetwinnow/cnetwinnow.cpp

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

isis/src/control/objs/BundleAdjust/BundleAdjust.h

isis/src/control/objs/BundleSettings/BundleSettings.cpp

isis/src/control/objs/BundleSettings/BundleSettings.h

isis/src/control/objs/BundleSettings/BundleSettings.truth

isis/src/control/objs/BundleSolutionInfo/unitTest.cpp