Reverting @cc72052943c8c01ed0c46dd9e438f8cb14301419 causing double consumption
Adding itemConsumeCount where necessary instead.
Fixing leading and trailing white space on NPC names and titles.

Patch by: @St3eT, @Zoey76
Merge pull request #10 from jurchiks/master

Getting rid of all the unnecessary stuff in dp build.xml.