Removing complicated configuration sections
Merge branch 'master' of https://github.com/remap/ndn-pi

Conflicts:
	README.md