Fix git commits after removing files to reflect the changes of Git 2.0
use git add --all
merge with master
reset.scss is copied in _default partial
merge with master
use git add --all