Huge updates :/
Merge branch 'master' of github.com:cartman/config