Fixed --link description
Updated mixin handling

--mixin now accepts SHORT_SCHEME#TERM alongside SCHEME#TERM