changed to use filetype rather than syntax
Git config changes
Dist::Zilla config
Ignoring keys
Merge branch 'master' of github.com:ivanwills/home-config

* 'master' of github.com:ivanwills/home-config:
  Added ignores
  Updated
  Added configuration of diffs

Conflicts:
	.gitignore
Added NVM config loading
Plugins updated?
More aliases
Turned off keyprog directive as I apparently don't have it
Added helper for searching one portal files
Added ruby rvm config
Merge branch 'master' into optus

* master:
  Added ruby rvm config
  Turned off keyprog directive as I apparently don't have it
  More aliases
  Plugins updated?
  Added NVM config loading
  Ignoring keys
  Dist::Zilla config
  Git config changes
  changed to use filetype rather than syntax

Conflicts:
	.bashrc
	.gitconfig
	.gitignore