Fixed keyboard shortcuts
Merge branch 'master' of github.com:psimonazzi/dotfiles

* 'master' of github.com:psimonazzi/dotfiles:
  Changed emacs font to M+
  Fixes to emacs config
  Modified bash prompt
  Updated git config
  Moved emacs libraries after merge
  Moved emacs libraries