idea settings
Merge branch 'master' of github.com:btilford/idea-settings