Fixed issue where @doc and @see weren't included in merge
Less ambiguous variable names
Merge pull request #106 from basho/jd-merge-doc

Fixed issue where @doc and @see weren't included in merge