Merge pull request #616 from ghoneycutt/add_confs