Support for @mixes and @mixin
Merge remote-tracking branch 'upstream/master' into supportmixin

Conflicts:
	doctrine.js
	test/parse.js
Merge pull request #60 from jonathanKingston/supportmixin

Support @mixin and @mixes. fixes #59