~ and .orig files removed
Merge branch 'master' of github.com:yoursunny/NDNFD