Merge branch 'master' of git://github.com/Yousack/.emacs.d

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents
	elpa/archives/melpa/archive-contents
	init.el
	srecode-map.el
fix wrong "setq" to "defvar" and auto save buffers without messages