Melpa updates and configuration fixes
Merge branch 'master' of github.com:/rajish/configs

Conflicts:
	.emacs.d/elpa/archives/marmalade/archive-contents
	.emacs.d/elpa/archives/melpa/archive-contents