Fixed some installation inconsitencies.
Merge remote-tracking branch 'origin/master'

Conflicts:
	install.sh
Some more installation improvements - now checks the data folder exists before creating one, for example. No longer overwrites app.cfg if it exists.