No zuo no die why you try?
It's a matter of life or death now. To be or not to be, it's a question.
Merge branch 'master' of github.com:ProfessorX/Emacs

Conflicts:
	elpa/alert-20140506.2032/alert-autoloads.el
	elpa/alert-20140506.2032/alert-pkg.elc
	elpa/alert-20140506.2032/alert.elc
	elpa/android-mode-20140421.540/android-mode-autoloads.el
	elpa/android-mode-20140421.540/android-mode-pkg.elc
	elpa/android-mode-20140421.540/android-mode.elc
	elpa/archives/gnu/archive-contents
	elpa/archives/melpa/archive-contents
	elpa/archives/org/archive-contents
	elpa/auctex-latexmk-20131108.2133/auctex-latexmk.elc
	elpa/auto-complete-20140322.321/auto-complete-config.elc
	elpa/company-jedi-20140125.1257/company-jedi.elc
	elpa/company-jedi-20140128.2127/company-jedi-pkg.elc
	elpa/company-jedi-20140311.439/company-jedi-pkg.elc
	elpa/ctable-20140206.1656/ctable-pkg.elc
	elpa/easy-kill-20140505.343/easy-kill-autoloads.el
	elpa/easy-kill-20140505.343/easy-kill-pkg.elc
	elpa/easy-kill-20140505.343/easy-kill.elc
	elpa/easy-kill-20140505.343/test.elc
	elpa/ecb-20131116.1319/ecb-buffertab.elc
	elpa/ecb-20131116.1319/ecb-cedet-wrapper.elc
	elpa/ecb-20131116.1319/ecb-cycle.elc
	elpa/ecb-20131116.1319/ecb-help.elc
	elpa/ecb-20131116.1319/ecb-layout.elc
	elpa/ecb-20131116.1319/ecb-speedbar.elc
	elpa/ecb-20131116.1319/ecb-symboldef.elc
	elpa/ecb-20131116.1319/ecb-upgrade.elc
	elpa/ecb-20140215.114/ecb-buffertab.elc
	elpa/ecb-20140215.114/ecb-cedet-wrapper.elc
	elpa/ecb-20140215.114/ecb-cycle.elc
	elpa/ecb-20140215.114/ecb-help.elc
	elpa/ecb-20140215.114/ecb-layout.elc
	elpa/ecb-20140215.114/ecb-speedbar.elc
	elpa/ecb-20140215.114/ecb-symboldef.elc
	elpa/ecb-20140215.114/ecb-upgrade.elc
	elpa/expand-region-20131111.329/expand-region-custom.elc
	elpa/expand-region-20131111.329/nxml-mode-expansions.elc
	elpa/expand-region-20131111.329/python-mode-expansions.elc
	elpa/expand-region-20131231.2159/expand-region-custom.elc
	elpa/expand-region-20131231.2159/nxml-mode-expansions.elc
	elpa/expand-region-20131231.2159/python-mode-expansions.elc
	elpa/expand-region-20140104.1421/expand-region-custom.elc
	elpa/expand-region-20140104.1421/nxml-mode-expansions.elc
	elpa/expand-region-20140104.1421/python-mode-expansions.elc
	elpa/expand-region-20140125.2237/expand-region-custom.elc
	elpa/expand-region-20140125.2237/nxml-mode-expansions.elc
	elpa/expand-region-20140125.2237/python-mode-expansions.elc
	elpa/expand-region-20140125.2237/text-mode-expansions.elc
	elpa/expand-region-20140127.112/expand-region-custom.elc
	elpa/expand-region-20140127.112/nxml-mode-expansions.elc
	elpa/expand-region-20140127.112/python-mode-expansions.elc
	elpa/expand-region-20140315.2326/expand-region-custom.elc
	elpa/expand-region-20140406.324/ruby-mode-expansions.elc
	elpa/flx-20140420.1131/flx-autoloads.el
	elpa/flx-20140420.1131/flx-pkg.elc
	elpa/flx-20140420.1131/flx.elc
	elpa/helm-projectile-20140418.331/helm-projectile-autoloads.el
	elpa/helm-projectile-20140418.331/helm-projectile-pkg.elc
	elpa/helm-projectile-20140418.331/helm-projectile.elc
	elpa/lua-mode-20131018.2259/lua-mode-pkg.elc
	elpa/malabar-mode-20140108.1841/malabar-misc.elc
	elpa/malabar-mode-20140108.1841/malabar-project.elc
	elpa/malabar-mode-20140108.1841/malabar-refactor.elc
	elpa/malabar-mode-20140108.1841/malabar-reflection.elc
	elpa/malabar-mode-20140114.805/malabar-jump-to-project.elc
	elpa/malabar-mode-20140114.805/malabar-misc.elc
	elpa/malabar-mode-20140114.805/malabar-project.elc
	elpa/malabar-mode-20140114.805/malabar-refactor.elc
	elpa/malabar-mode-20140114.805/malabar-reflection.elc
	elpa/malabar-mode-20140114.805/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140115.656/malabar-misc.elc
	elpa/malabar-mode-20140115.656/malabar-project.elc
	elpa/malabar-mode-20140115.656/malabar-refactor.elc
	elpa/malabar-mode-20140115.656/malabar-reflection.elc
	elpa/malabar-mode-20140115.656/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140117.937/malabar-project.elc
	elpa/malabar-mode-20140117.937/malabar-refactor.elc
	elpa/malabar-mode-20140117.937/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140120.957/malabar-misc.elc
	elpa/malabar-mode-20140120.957/malabar-project.elc
	elpa/malabar-mode-20140120.957/malabar-refactor.elc
	elpa/malabar-mode-20140120.957/malabar-reflection.elc
	elpa/malabar-mode-20140120.957/malabar-util.elc
	elpa/malabar-mode-20140120.957/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140121.851/malabar-jump-to-project.elc
	elpa/malabar-mode-20140121.851/malabar-misc.elc
	elpa/malabar-mode-20140121.851/malabar-project.elc
	elpa/malabar-mode-20140121.851/malabar-refactor.elc
	elpa/malabar-mode-20140121.851/malabar-reflection.elc
	elpa/malabar-mode-20140121.851/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140123.600/malabar-misc.elc
	elpa/malabar-mode-20140123.600/malabar-project.elc
	elpa/malabar-mode-20140123.600/malabar-reflection.elc
	elpa/malabar-mode-20140123.600/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140124.1619/malabar-jump-to-project.elc
	elpa/malabar-mode-20140124.1619/malabar-misc.elc
	elpa/malabar-mode-20140124.1619/malabar-project.elc
	elpa/malabar-mode-20140124.1619/malabar-refactor.elc
	elpa/malabar-mode-20140124.1619/malabar-util.elc
	elpa/malabar-mode-20140124.1619/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140127.1001/malabar-misc.elc
	elpa/malabar-mode-20140127.1001/malabar-util.elc
	elpa/malabar-mode-20140127.909/malabar-misc.elc
	elpa/malabar-mode-20140127.909/malabar-project.elc
	elpa/malabar-mode-20140127.909/malabar-refactor.elc
	elpa/malabar-mode-20140127.909/malabar-reflection.elc
	elpa/malabar-mode-20140128.1331/malabar-misc.elc
	elpa/malabar-mode-20140128.1331/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140130.1538/malabar-refactor.elc
	elpa/malabar-mode-20140207.1440/malabar-refactor.elc
	elpa/malabar-mode-20140221.1912/malabar-project.elc
	elpa/malabar-mode-20140224.506/malabar-jump-to-project.elc
	elpa/malabar-mode-20140224.506/malabar-project.elc
	elpa/malabar-mode-20140224.506/malabar-reflection.elc
	elpa/malabar-mode-20140224.506/wisent-malabar-java-wy.elc
	elpa/malabar-mode-20140307.1420/malabar-project.elc
	elpa/smex-20140425.1314/smex-autoloads.el
	elpa/smex-20140425.1314/smex-pkg.elc
	elpa/smex-20140425.1314/smex.elc
	elpa/undo-tree-20140509.522/undo-tree-autoloads.el
	elpa/undo-tree-20140509.522/undo-tree-pkg.elc
	elpa/undo-tree-20140509.522/undo-tree.elc
	elpa/zenburn-theme-20140418.13/zenburn-theme-autoloads.el
	elpa/zenburn-theme-20140418.13/zenburn-theme-pkg.elc
	modules/prelude-erc.elc
	modules/prelude-python.elc
	modules/prelude-scheme.elc
	modules/prelude-xml.elc
	projectile-bookmarks.eld
	savefile/.smex-items
	savefile/ido.hist
	savefile/recentf
	savefile/savehist
	savefile/saveplace
	srecode-map.elc

All is well that ends well.
I love Masdar and hope I could, well, finish my education here.