OSX fixes, p4 config
Bump submodules
Merge branch 'master' of github.com:masteinhauser/dotfiles