making sure settings are in line
Merge branch 'master' of github.com:zhangmarvin/stash