Merge remote-tracking branch 'upstream/master'

* upstream/master:
  updates to v1.0.1 for component.json
  converted tab width to 2 and removed semi colon from scss file for the hyphen demo.
  Removing the semi-colon for consistency
  v1.0.1 for Stylus

Conflicts:
	css/typeplate.css
	stylus/typeplate.styl
Merge branch 'master' of github.com:jnwng/typeplate-bower

* 'master' of github.com:jnwng/typeplate-bower:

Conflicts:
	css/typeplate.css
	stylus/typeplate.styl
Modifying stylus file