some theme changes
Merge branch 'master' of github.com:hauspie/dotfiles

Conflicts:
	_emacs.d/el-get/el-get
	_emacs.d/el-get/yasnippet
[xinit] check files before sourcing/loading
Merge branch 'master' of github.com:hauspie/dotfiles

Conflicts:
	_config/gtk-3.0/settings.ini
	_emacs.d/el-get/el-get
	_emacs.d/el-get/yasnippet
	_xinitrc