merging master into optus
Merge branch 'optus' of github.com:ivanwills/home-config into optus

* 'optus' of github.com:ivanwills/home-config: (32 commits)
  Added ignores
  Updated
  Added configuration of diffs
  Updated
  Added configuration of diffs
  nvm config. should it be moved to .bashrc?
  Updated vim
  Split ftl to own class
  Added vundle as a submodule
  Dzil config
  More configs
  Synaptic config
  Fixed quoting issue
  More global ignores
  Mongo config
  Script to symlink config
  Updated config
  Added more dot files
  Template cmd config
  placeholder
  ...

Conflicts:
	.cmdaliaser/git.conf
	.gitignore
	.profile
	.vimrc
	bin/setup
Merged master to optus