Linux Ice.py location, error message
not needed here
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel
Not sure where these changes came from
Merge branch 'master' of https://github.com/NPSVisionLab/CVAC
new ice definitions, high-level util functions in the style of easy
added a lock file for starting and stopping services
ServiceMan startServices design
better comment
instructions now specify branching off devel
newice invocation model
ServiceInvocation builds
whitespace
Merge branch 'feature-newice' of https://github.com/NPSVisionLab/CVAC into devel

Conflicts:
	include/version.h.repo
	src/util/CMakeLists.txt
	test/UnitTests/python/CMakeLists.txt
name of service is set dynamically, via config.icebox
whitespace and dynamic name
whitespace and dynamic name
reworked ServiceManager: Ice::Service is subclass now
ServiceManI.h contains Ice-related functions
more thorough import checks