Added some more fixes to the ubuntu install script
Merge branch 'master' of https://github.com/dclark87/C-PAC

Conflicts:
	scripts/cpac_install_ubuntu.tar.gz