Merge remote-tracking branch 'upstream/master' into supportmember
Adding in supprort for @member and @var. fixes #55
Merge pull request #56 from jonathanKingston/supportmember

Support for @member and @var. fixes #55
Add required comment
Merge remote-tracking branch 'upstream/master' into supportversion
Adding in tests for @version and @since. fixes #57
Support for @mixes and @mixin
Merge remote-tracking branch 'upstream/master' into supportmixin

Conflicts:
	doctrine.js
	test/parse.js
Making @since and @version explicitly use the Rules definition with description. fixes #58
Merge pull request #58 from jonathanKingston/supportversion

Support @version and @since
Merge pull request #60 from jonathanKingston/supportmixin

Support @mixin and @mixes. fixes #59
Merge remote-tracking branch 'upstream/master' into supportrequire
Adding in support for @requires. fixes #61
Merge pull request #62 from jonathanKingston/supportrequire

Support @requires. fixes #61
Merge remote-tracking branch 'upstream/master'