Updates to various config files - nothing specific
Minor Updates
Merge branch 'master' of https://github.com/einon/development_configs

Conflicts:
	dev.tmux