cleanup and added machine pacman
cleanup and added pacplus machine
cleanup private netbeans stuff
fixup gitignore