get nlsr conf file back in sync
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
nlsr conf with validation update for caida