misc config changes
Merge branch 'master' of http://github.com/charlesxyan/conf