replaced neocomplcach with neocomplete
added scala/akka tags
changed ctrlp to just use git root at project root
fixed merge conflicts