merge .gitignore from sass dev branch
new watermelon colored pixelgraff style, selectively merged from the sass dev branch.