updated git ignore
Merge branch 'master' of github.com:daniellawrence/external_naginator