Code tidy up

I have imported the very latest of these files from google code with my changes in them. I have removed nmap from the setup.sh as it is now in the alias file which is better and then can remove some unneeded code. Also this PR is me up-streaming my changes