Dan Schaper 04c31f3d06 Merge branch 'development' ...

Conflicts:
	automated install/basic-install.sh

2015-12-06 00:48:15 -08:00

..

basic-install.sh

Merge branch 'development'

2015-12-06 00:48:15 -08:00

uninstall.sh

uninstall script

2015-11-25 13:36:39 -08:00