.gitignore that .DS_Store
Revert "Move all the color definitions over to _colors"

This reverts commit 9cc96c39031c847c6213f38b8616ed167ebc29bc.

Conflicts:
	styles/_colors.scss
	styles/main.scss