updating .gitignore to ignore sass-cache
fixing issues outlined by Seb's code review
added sass cache and css error file to gitignore
merge conflict on .gitignore
Merge branch 'develop' into uf-459
Manual merge/resolve conflicts