Jacob Salmela fd9b34ad9b Merge branch 'master' into pr/118 ... # Conflicts: # automated install/basic-install.sh		2015-12-06 16:21:45 -06:00
..
basic-install.sh	Merge branch 'master' into pr/118	2015-12-06 16:21:45 -06:00
uninstall.sh	uninstall script	2015-11-25 13:36:39 -08:00