Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Added tests for color helpers
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  New tests
  Reworked some tests
  Update Gruntfile
  Restructure tests folder
Add test for _strip-token
Merge branch 'add-strip-token-test' of github.com:FWeinb/SassyJSON into FWeinb-add-strip-token-test