remove aliases for teamocil and use function

git-svn-id: https://svn.sixfeetup.com/svn/private/claytron/dotfiles/trunk@43989 7abc7aa1-7e52-db11-9331-00508bd72530