Lunar stuff...
Merge branch 'unstable' of /data/proj/SAF/GIT/mpop into unstable

Conflicts:
	mpop/satin/viirs_sdr.py
Minor clean up
Updated npp-template to fit the new viirs reader using the (new) plugin-loader system
Merge branch 'unstable' of /data/proj/SAF/GIT/mpop into unstable

Conflicts:
	etc/npp.cfg.template