Merge conflicts, update from remote changes

diff --cc .gitmodules
index 693eb349010ca8dc96bb624e3f362565e096a600,dbca2d7fc6997048e3340a57752344e1cf97fbbb..d1f9b137087576241ea34555b1fb0d4dd2a8f62a
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -22,6 -19,12 +19,12 @@@
  [submodule "dotvim/bundle/typescript-vim"]
        path = dotvim/bundle/typescript-vim
        url = https://github.com/leafgarland/typescript-vim.git
 -[submodule "dotvim/bundle/vim-solidity"]
 -      path = dotvim/bundle/vim-solidity
 -      url = git@github.com:tomlion/vim-solidity.git
 +[submodule "dotvim/bundle/vim-javascript"]
 +      path = dotvim/bundle/vim-javascript
 +      url = git@github.com:pangloss/vim-javascript.git
+ [submodule "dotvim/bundle/ale"]
+       path = dotvim/bundle/ale
+       url = git@github.com:w0rp/ale.git
+ [submodule "dotvim/bundle/ctrlp.vim"]
+       path = dotvim/bundle/ctrlp.vim
+       url = git@github.com:ctrlpvim/ctrlp.vim.git

diff --cc dotbash_profile
index 0ed78005162d842506e18be73e772a73b29a6a55,0d37176f7244494aaa11282d48b1d688471eea8b..2bfb2183a7948e32ec8f340b9e2873d0f9dfad9b
--- 1/dotbash_profile
--- 2/dotbash_profile
+++ b/dotbash_profile
@@@ -10,7 -10,7 +9,6 @@@ export TERM=xterm-256colo
  color_prompt=yes
  
  export SCRUM_DIR=~/Documents/scrum/
--export CHROME_BIN=`which chromium-browser`
  
  ##################################################
  #
@@@ -18,21 -18,21 +16,11 @@@
  #
  ##################################################
  
--#   Package install
--if [ -f /usr/local/git/contrib/completion/git-completion.bash ]; then
--    . /usr/local/git/contrib/completion/git-completion.bash
--fi
--
  #   Homebrew install
  if [ -f /usr/local/etc/bash_completion.d/git-completion.bash ]; then
      . /usr/local/etc/bash_completion.d/git-completion.bash
  fi
  
--#   RabbitMQ admin
--if [ -f /usr/local/etc/bash_completion.d/rabbitmqadmin.bash ]; then
--    . /usr/local/etc/bash_completion.d/rabbitmqadmin.bash
--fi
--
  ##################################################
  #
  #   Command Prompt Customizations
@@@ -162,6 -148,8 +154,5 @@@ complete -F _ssh_hosts ss
  #
  ##################################################
  
 -alias jsoncb="pbpaste | python -mjson.tool | gvim -"
  alias grep="grep --color=auto"
--
 -export PATH="$HOME/.cargo/bin:$PATH"
 -export PATH="~/.npm-global/bin:$PATH"
 +[[ -s "$HOME/.profile" ]] && source "$HOME/.profile"

diff --cc dotvimrc
Simple merge