Updating AWE commit.  Updating Makefile to match changes to config files.