This cleans up config after fix #421. 

This fixes #421 and https://github.com/chocolatey/chocolatey/issues/430#issuecomment-36642776
Fixes #421 and bill-long#1

This fixes #421 and https://github.com/bill-long/chocolatey/pull/1#issuecomment-36649015
Merge pull request #1 from Redsandro/patch-4

This cleans up config after fix #421.
Merge #2
Merge pull request #2 from Redsandro/patch-5

Fixes #421 and bill-long#1
Merge branch 'master' into get-binroot-fix