correct the filename of the yum provisioner unit test
add unit test for Config.dict_merge
add contributing doc
prepare for release 1.2.97-dev
prepare for release 1.2.98-dev
ignore vim temporary files
fix for 88.  when I refactored the policy_file stuff to be in the YAML, I put it in the apt_test.yml (now deleted for clarity) and forgot to put it in the real yml file.  this caused a problem when it tried to concat a str with None
prepare for release 1.2.125-dev
Merge pull request #90 from kvick/issue_88

Issue 88.  This should re-enable amination on ubuntu
prepare for release 1.2.129-dev
allow provision_config_files to be directories (for copying cached yum meta files)
remove stray remove
Merge branch 'testing' of github.com:coryb/aminator
* add "clean_repos" yum plugin option to specify which repos to clean
  before doing install
add tests for provision_configs with directories
update per #94 review comments
Merge pull request #94 from coryb/clean-repos

allow for "clean_repos" yum provisioner option
Merge pull request #95 from Netflix/testing

merge from testing branch
prepare for release 1.2.130-dev
prepare for release 1.2.131-dev