added more FX servers
added torch to ssh list
cleaned up extra lines breaks and tweaked config slightly for use on cpaquin macbook
changed textmate aliases to vim
added cdf alias per http://brettterpstra.com/2013/02/09/quick-tip-jumping-to-the-finder-location-in-terminal/
cleaned up mege conflict with master for aliases