Cleaned up some of the configuration files

Still runs configure once on the first make, I am not
sure how to have it stop doing that.