Variety of changes

* Adding alias for svnmerge
* Adding QUACK location paremeters for running local tests
* Additional Maven options for making source retrieval work again in IntelliJ
* Add Slate config (cool tool!)
* Updating vim config
* Adding bash completion to zsh, doesn't seem to be doing all I need yet though