This cleans up config after fix #421.

This fixes #421 and https://github.com/chocolatey/chocolatey/issues/430#issuecomment-36642776
Merge branch 'stable'

* stable:
  This cleans up config after fix #421.