minor changes
Merge branch 'master' of github.com:dsteinberg/ICCV2013-UV