add a local config
Merge branch 'master' of github.com:plicease/config-tik-private

Conflicts:
	csh.cshrc