Merge commit '233a812' into bfgminer

Conflicts:
	miner.c

miner.c

@@ -4890,7 +4890,8 @@ int main(int argc, char *argv[])
 				break;
 			case -1:
 				applog(LOG_WARNING, "Error in configuration file, partially loaded.");
-				applog(LOG_WARNING, "Start BFGMiner with -T to see what failed to load.");
+				if (use_curses)
+					applog(LOG_WARNING, "Start BFGMiner with -T to see what failed to load.");
 				break;
 			default:
 				break;