Merge pull request #19 from jaredbischof/master

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