diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 37b2d7f..fed3d2e 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -8,7 +8,14 @@ Plug 'tpope/vim-rhubarb'
 Plug 'neomake/neomake'
 
 " General completion. Needs plugins to extend
-Plug 'roxma/nvim-completion-manager'
+Plug 'ncm2/ncm2'
+Plug 'roxma/nvim-yarp' " for ncm2
+" NOTE: you need to install completion sources to get completions. Check
+" our wiki page for a list of sources: https://github.com/ncm2/ncm2/wiki
+Plug 'ncm2/ncm2-bufword'
+Plug 'ncm2/ncm2-tmux'
+Plug 'ncm2/ncm2-path'
+
 
 " Language-aware fancy things. Needs lang server config. Used, but what for?
 Plug 'autozimu/LanguageClient-neovim', { 'do': ':UpdateRemotePlugins' }
@@ -189,6 +196,12 @@ let g:neomake_ruby_rubocop_rails_maker = {
 
 let g:deoplete#enable_at_startup = 1
 
+" ncm2 commands for completion
+" enable ncm2 for all buffers
+autocmd BufEnter * call ncm2#enable_for_buffer()
+" :help Ncm2PopupOpen for more information
+set completeopt=noinsert,menuone,noselect
+
 " Start interactive EasyAlign in visual mode (e.g. vipga)
 xmap ga <Plug>(EasyAlign)
 
diff --git a/.gitignore_global b/.gitignore_global
index 43ca472..af302a6 100644
--- a/.gitignore_global
+++ b/.gitignore_global
@@ -3,3 +3,13 @@
 *.swp
 *.swo
 doc/tags*
+
+node_modules/
+.idea/*
+*.log
+*.iml
+target/*
+
+syntax: regexp
+(?i)\.iml
+
diff --git a/.ideavimrc b/.ideavimrc
index 35941f8..6c2108b 100644
--- a/.ideavimrc
+++ b/.ideavimrc
@@ -1,5 +1,6 @@
 noremap <Space> :
 let mapleader = ","
+" Use :actionlist [pattern] to find more actions
 noremap <Leader>v :action SearchEverywhere<CR>
 noremap <Leader>c :action ActivateTerminalToolWindow<CR>
 noremap <C-h> <C-w>h
@@ -8,6 +9,7 @@ noremap <C-k> <C-w>k
 noremap <C-l> <C-w>l
 noremap - :action GotoNextError<CR>
 noremap _ :action GotoPreviousError<CR>
+noremap gq :action com.andrewbrookins.idea.wrap.WrapParagraphAction<CR>
 set ignorecase
 set smartcase
 set showmatch
diff --git a/.kwm/kwmrc b/.kwm/kwmrc
index 06e0259..4be6241 100644
--- a/.kwm/kwmrc
+++ b/.kwm/kwmrc
@@ -125,6 +125,7 @@ blacklists an application from Kwms tiling
     kwmc rule owner="VOX" properties={float="true"}
 */
 kwmc rule owner="Lightroom" properties={float="true"}
+kwmc rule owner="Adobe Lightroom CC" properties={float="true"}
 kwmc rule owner="Stickies" properties={float="true"}
 kwmc rule owner="Steam" properties={float="true"}
 kwmc rule owner="App Store" properties={float="true"}
diff --git a/.zshrc b/.zshrc
index 1ed57b3..f57b803 100644
--- a/.zshrc
+++ b/.zshrc
@@ -323,6 +323,8 @@ alias -s mpg="mplayer"
 alias djm="cd $DEV_ROOT/DistelliJavaModels"
 alias k8s="cd $DEV_ROOT/K8SDashboard"
 alias pwf="cd $DEV_ROOT/pfc-web-framework"
+alias pvs="cd $DEV_ROOT/pipelines-version-set"
+alias pfc="cd $DEV_ROOT/PipelinesForContainers"
 alias apm="cd $DEV_ROOT/AppPipelineManager"
 alias aem="cd $DEV_ROOT/AppEventsManager"
 alias wui="cd $DEV_ROOT/DistelliWebUi"
diff --git a/Brewfile b/Brewfile
index 3b16289..fbf4d30 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,11 +1,11 @@
 # Work fun
 tap "d12frosted/emacs-plus" ; brew "emacs-plus"
-cask "blue-jeans"
+cask "blue-jeans" # Need /usr/local/Caskroom/blue-jeans/2.7.0.450/BlueJeansInstaller.app
 cask "docker" # docker docker
 cask "hipchat" # Work chat
 cask "slack" # Work/fun chat
 cask "tunnelblick" # Work vpn
-cask "virtualbox" # vms
+cask "virtualbox" # vms - reboot and approve kernel extension
 cask "vagrant" # all the vms
 brew "git" # Newer than what brew installs
 brew "gnupg" # Crypto, not currency
@@ -13,7 +13,7 @@ brew "pinentry-mac" # gpg card pin entry
 brew "htop" # L33t
 brew "hub" # git, for github
 brew "ncdu" # Find big files
-brew "neovim" # Edit stuff
+brew "neovim" # Edit stuff. Then `curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim`
 brew "ripgrep" # Faster grep/ack/ag
 brew "socat" # Better netcat
 brew "tmux" # Terminal thingy
@@ -30,6 +30,7 @@ brew "hugo" # node stuff?
 tap "homebrew/cask-versions" # For FF Nightly and java8
 cask "java8" # jdk 8
 cask "intellij-idea" # java dev
+brew "maven" # java package management
 cask "visual-studio-code" # frontend dev
 brew "pyenv" # rbenv for py
 brew "pyenv-virtualenv" # rbenv for pyenv?
@@ -64,8 +65,7 @@ cask "onedrive" # File sync
 cask "little-snitch" # Personal egress filtering
 cask "vlc" # Music videos
 brew "youtube-dl" # Music videos
-cask "zerotier-one" # Personal network
-# cask microsoft-office # Not 365 apparently
+cask "zerotier-one" # Personal network - reboot and approve kernel extension
 
 # Browsers
 cask "brave" # For bt