 
         ;; Version control
 
-        (:name magit :type git :url "git://github.com/philjackson/magit.git")
+        magit
         gist
         (:name magithub :type git :url "git://github.com/nex3/magithub.git")
         (:name git-blame :type http :url "http://git.kernel.org/?p=git/git.git;a=blob_plain;f=contrib/emacs/git-blame.el;hb=HEAD")


        ;; CSS

        (:name rainbow-mode :type elpa)
        (:name tidy :type emacswiki)

        (:name csv-mode :type http :url "http://centaur.maths.qmul.ac.uk/Emacs/files/csv-mode.el")
        (:name csv-nav :type emacswiki)
        (:name markdown-mode :type git :url "http://jblevins.org/git/markdown-mode.git")
        textile-mode

        (:name haskell-mode :type darcs :url "http://code.haskell.org/haskellmode-emacs/")
        (:name tuareg-mode :type svn :url "svn://svn.forge.ocamlcore.org/svnroot/tuareg/trunk")
        (:name lua-mode :type elpa)
))



        ;; Basics

        smex
        ido-hacks
        maxframe
        session
        (:name revive :type http :url "http://www.gentei.org/~yuuji/software/revive.el")
        (:name project-local-variables :type elpa)
        (:name dired-plus :type git :url "git://github.com/emacsmirror/dired-plus.git")
        scratch
        (:name diminish :type http :url "http://www.eskimo.com/~seldon/diminish.el")
        (:name autopair :type svn :url "http://autopair.googlecode.com/svn/trunk/")
        (:name undo-tree :type git :url "http://www.dr-qubit.org/git/undo-tree.git")
        hl-sexp
        (:name highlight-symbol :type elpa)
        highlight-parentheses
        (:name smooth-scrolling :type http :url "http://adamspiers.org/computing/elisp/smooth-scrolling.el")
        (:name fuzzy-format :type emacswiki)
        (:name regex-tool :type git :url "git://github.com/jwiegley/regex-tool.git")
        todochiku
        (:name edit-server :type http :url "http://github.com/stsquad/emacs_chrome/raw/master/servers/edit-server.el")
