Made GSL dependency conditional; minor build system changes