Modified fornav and its makefile in preparation for optimizations to come (hopefully)
Removed software bundle tests (not used anymore)