Added replace patterns and cleaned up config field names.  Closes #20, closes #22