Merge pull request #22 from lisafrench/master

Big ole commit.
Removed redundant deploy.sh
Fixes the build by removing sass.
Fixing merge conflict.