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

Conflicts:
	.emacs
	.emacs.d/elpa/archives/gnu/archive-contents
	.emacs.d/elpa/archives/marmalade/archive-contents
	.emacs.d/elpa/archives/melpa/archive-contents
	.emacs.d/elpa/coffee-mode-20130421.1156/coffee-mode-autoloads.el
	.emacs.d/elpa/coffee-mode-20130421.1156/coffee-mode.el
	.emacs.d/elpa/deft-20130409.2313/deft-autoloads.el
	.emacs.d/elpa/deft-20130409.2313/deft.el
	.emacs.d/elpa/magit-20130409.500/.dir-locals.el
	.emacs.d/elpa/magit-20130409.500/magit-autoloads.el
	.emacs.d/elpa/magit-20130409.500/magit-bisect.el
	.emacs.d/elpa/magit-20130409.500/magit-blame.el
	.emacs.d/elpa/magit-20130409.500/magit-flow.el
	.emacs.d/elpa/magit-20130409.500/magit-key-mode.el
	.emacs.d/elpa/magit-20130409.500/magit-stgit.el
	.emacs.d/elpa/magit-20130409.500/magit-svn.el
	.emacs.d/elpa/magit-20130409.500/magit-topgit.el
	.emacs.d/elpa/magit-20130409.500/magit-wip.el
	.emacs.d/elpa/magit-20130409.500/magit.el
	.emacs.d/elpa/magit-20130409.500/rebase-mode.el
	.emacs.d/elpa/scala-mode2-20130403.1734/scala-mode2-autoloads.el
	.emacs.d/elpa/scala-mode2-20130403.1734/scala-mode2-fontlock.el
	.emacs.d/elpa/scala-mode2-20130403.1734/scala-mode2-indent.el
	.emacs.d/elpa/scala-mode2-20130403.1734/scala-mode2-lib.el
	.emacs.d/elpa/scala-mode2-20130403.1734/scala-mode2-map.el
	.emacs.d/elpa/scala-mode2-20130403.1734/scala-mode2-paragraph.el
	.emacs.d/elpa/scala-mode2-20130403.1734/scala-mode2-syntax.el
	.emacs.d/elpa/scala-mode2-20130403.1734/scala-mode2.el
	.emacs.d/elpa/web-mode-20130424.43/web-mode-autoloads.el
	.emacs.d/elpa/web-mode-20130424.43/web-mode.el
Merge branch 'master' of github.com:rajish/configs

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