'rons-mbp.hsd1.ca.comcast.net_20140310_21:05:18'
Merge branch 'master' of github.com:ronkeizer/test
 'ucsf2-73-32.ucsf.edu_20140311_13:29:26'