Now ignoring annoying grunt/npm output files like '2.1'
Now ignoring OS or Editor files (shamelessly stolen from the Bootstrap project gitignore)
Merge branch 'hotfix/Add_to_Gitignore' into develop