add and import dependent scss
Converted to new buttons
convert tabs to spaces
Fixed conflicts
Merge branch 'master' into buttons
comment out Facebook logins, various other tweaks