A few more long -> slong
Add valgrind target to Makefile
Merge remote-tracking branch 'mhansen/trunk' into trunk