add whitespace cleanup

git-svn-id: https://svn.salilab.org/imp/trunk@17245 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
add post-merge warning

git-svn-id: https://svn.salilab.org/imp/trunk@17246 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
fix which shell scripts are using

git-svn-id: https://svn.salilab.org/imp/trunk@17247 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
set color

git-svn-id: https://svn.salilab.org/imp/trunk@17248 e91f8c7b-0e32-4433-a9ac-4502d39a4eab