Added not expanding tabs for 1P work
Added logging maven out put
Added shell defaults
Merge branch 'master' into optus

* master:
  Added shell defaults
  Added logging maven out put
  Added not expanding tabs for 1P work

Conflicts:
	.csrc
	.vimrc