2.0.3 updates
Merge pull request #27 from khawkins/203_update

2.0.3 updates
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	Dependencies
	package.json
Merge pull request #28 from khawkins/unstable

Package: merging master into unstable