more updates
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops