moving grunt options into a grunt folder to be cleaner
Merge remote-tracking branch 'origin/master' into feature/nmccready_grunt_options_cleanup
Merge pull request #845 from nmccready/feature/nmccready_grunt_options_cleanup

[master] clean up of grunt options