ssh config update
minor modifications to prompt
python virtual env shell/prompt handling
tmux session handling
Merge remote-tracking branch 'origin/master' into ccap

Conflicts:
	secure