adding conditional logic for grunt install
updating .gitignore
Merge branch 'dev' of github.com:e2tha-e/fepper