Updated pickle
Fixed Character reference in the npc command
Put the commands back in one file.  It was griefing me.
Merge branch 'develop'