Updates on installed packages
Merge branch 'master' of github.com:/rajish/configs

Conflicts:
	.emacs.d/elpa/archives/gnu/archive-contents
	.emacs.d/elpa/archives/melpa/archive-contents
	.emacs.d/elpa/coffee-mode-20130125.2353/coffee-mode-autoloads.el
	.emacs.d/elpa/guru-mode-20121016.1452/guru-mode-autoloads.el