gitconfig: removed old Qt stuff
git: include config file from METASYSTEM_LOCAL

GIT v1.7.10 upwards supports the include.path config attribute.

This patch leverages that feature, to include a gitconfig file
from METASYSTEM_LOCAL, if available.
Merge branch 'master' of github.com:garethstockwell/metasystem

Conflicts:
	core/bin/metasystem-id.py
Various setup / startup fixes

Found when installing on Synology DSM 4.1
shrc: do not alias to vim if not installed
setup: added setup-dsm.sh