Return error messages on delete
Merge branch 'master' of github.com:Shadytel/sim-tools
Fix some Makefile bugs and add some Windows support