Merge branch 'master' of cloud.cs.berkeley.edu:~/gitprojects/cnm_scripts into symlink
Merge branch 'symlink' of cloud.cs.berkeley.edu:gitprojects/cnm_scripts