Merge pull request #2 from pwnieexpress/PAD-42

I am going ahead and merging this to create a QA update.
Pwnie is not authorized to distribute this application
Fixed merge conflict, enforcing removal of Nmap