Fixing some issues - Major construction
Merge branch 'master' of https://github.com/dustinthughes/splash

Conflicts:
	splash_bootstrap.sh