Adding the intermediate output of the standalone tests to be ignored
Augmentation: Code cleaning + adding debug to trace memory usage for valgrind
Merge branch 'master' of github.com:kbroman/qtl
Merge branch 'master' of github.com:kbroman/qtl into mqmValgrind
Augmentation: Now always cleaning variable: markers, holding the recoded markers from R
Augmentation: More comments, removing position and r from the R interface as they were unused
Augmentation fixed 2 memory bugs, additional I added comments about some of the quirks of augmentation using the different strategies
Augmentation, this should fix another couple of memory leaks in the augmentation routine
Fixed a 10mb memory leak in the MQMaugmentCode, this was/is the major loss observed by valgrind
This should be free only after being passed back to R, otherwise we get reads in freed memory
Another memory leak plugged in mqmscan, forgot to deallocate the markers
Merge branch 'mqmValgrind' of git://github.com/DannyArends/qtl into devel
Fix for the listeria data, we should not free stuff when it is still referenced by R
Cleaning the R code of augmentation a bit, adding some comments
Fixing a couple of memory bugs, due to no Freeing memory before allocating new data to the same pointer (recombination_frequencies & relative_marker_position)
Fixed another couple memory leaks, only 3 Valgrind warnings left
Merge branch 'master' of github.com:DannyArends/qtl into mqmValgrind
Merge branch 'mqmValgrind' of git://github.com/DannyArends/qtl into devel
Update version + date
Merge branch 'devel' into scantwoperm

Fix conflict in DESCRIPTION (re version + date)