Updates sass source from gh-pages
Updates bower.json
Finishes merging
Remove docs.scss