Merge branch 'master' into workstation
Merge branch 'master' into mx_only
Merge branch 'master' into workstation
Merge branch 'master' into mx_only
layers of screen upon screen

moving screenrc files to screen/
change cgtest to take a base dir as an argument
pull mxctl.pl from $HOME/bin/
reorder components of call_stack

remove user_api, mgmt_api, mgmt_ui
add nim_stack function
functions to stop/start all dcm services on remote hosts
limit depth of path searching to 3 levels
rework host check for limiting path searching

Switch from an if / else model to a case statement. This allows
a little more flexibility in the host matching. It also makes
the matching code slightly more compact.
Merge branch 'master' into workstation
Merge branch 'master' into mx_only

Conflicts:
	bash_aliases
	screen/screenrc
	screen/screenrc-blackbox
	screen/screenrc-prod
	screen/screenrc-tier
	screen/screenrc-workstation
	screenrc
	screenrc-meta
seems like these changes should already be here...
update vim/bundles
Merge branch 'mx_only'

Conflicts:
	bash_aliases
Merge branch 'workstation'
bash additions
get 256 colors from screen