Refactored the user prompt code.  Cleaned up Makefile and README.