updated rainbow modules to use my fork
Merge branch 'master' of github.com:masukomi/masuconfigs

* 'master' of github.com:masukomi/masuconfigs:
  added bin/vim_colors_script.vim
  added subup (submodule update) alias to .gitconfig
  updated submodules and .vimrc
  added rainbow_parentheses.vim submodule
  hopefully fixed bug in submodules
  added Border function to .vimrc
  added git sta alias and sorted aliases

Conflicts:
	.gitmodules
	.vimrc
added fswatch to bin directory
updated submodules