Cleaned up make system, updated README to reflect.