.gitignore modified do not track personal settings
Merge branch 'jquery' of github.com:nedforce/devcms-core into jquery