Merge pull request #1551 from jetaggart/master

Add beginning of acceptance tests for redesign
Update contributing guide
remove sass-cache, ignore more rubymine