updates in packages
Merge branch 'master' of https://github.com/codychan/dotemacs.d

Conflicts:
	elpa/dash-20140604.905/dash-autoloads.el
	elpa/dash-20140604.905/dash-pkg.elc
	elpa/dash-20140604.905/dash.elc