Add swank and typed plugins
Disable ff for git merge by default (causing issues sometimes)
Replace lein swank with lein ritz