minor mods to make script more general
Merge branch 'master' of https://github.com/hickerson/UCNA into 2011/2012