removed compass, added grunt, small language updates
+
Merge branch 'master' into gh-pages