Update installed packages
Merge branch 'master' of bitbucket.org:mota/.emacs.d
Merge branch 'master' of bitbucket.org:mota/.emacs.d

Conflicts:
	installed-packages