nate 28f2a1309e Merge branch 'development' ...

Conflicts:
	automated install/uninstall.sh

2016-03-31 20:25:54 -05:00

..

basic-install.sh

Merge branch 'development'

2016-03-31 20:25:54 -05:00

uninstall.sh

Merge branch 'development'

2016-03-31 20:25:54 -05:00