Merge branch 'release/2013-05-29-15-48' into develop
Merge branch 'hotfix/tag' into develop
Merge branch 'hotfix/web-mode-2014-05-30-11-04' into develop
Disable paredit mode for php files
Assign icicles open project to f11
Use latest version of paredit
Use latest version of feature-mode
Features from clojure implemented in elisp
Make sure dependencies are installed
Enable dired details
Import features from other languages
Enable git-flow in magit
Merge branch 'release/2014-06-18-09-14-14'