pyenv, omit files etc
using melpa repository, instead of marmalade, to get latest versions
Merge branch 'master' of github.com:kirubakaran/emacs-kiru

Conflicts:
	dot-emacs.el