Add conditionals to GPS code in CLI - don't compile them in without #define GPS