Merge pull request #24 from darielnoel/master

upgrade version number
merge source comments; ignore private functions

Merge comments found in the source file with those generated by
    smartcomments - give preference to the source file's comments where
    there are collisions

Provide an option in the config file to ignore private functions
    (any function with a name that starts with '_').  Private functions
    are ignored by default.

rename bin/index.js to bin/smartcomments
better merge logic; misc other
fix in mergeOtherSrcTags()

fix in mergeOtherSrcTags()
add a few comments
added config option favor_generated for @return

added a config option favor_generated - if true (the default), the
    generated comment's @return tag (and possibly other tags in the
    future) overrides what is in the source file.  Otherwise, the source
    file @return or @returns tag is kept.  The reason one might want to
    keep the source file's @return is that it might have additional
    description about what is being returned beyond just the type.
Merge pull request #28 from HBOCodeLabs/master

merge source comments; ignore private functions
updating version number
Merge branch 'v0.3.0'
bug fixes

don't gobble up whitespace in front of non-tag comment lines
allow parameter names to have colon and dash (':', '-')
if a parameter name has something really weird in it, don't throw an
    exception - return false if we failed to determine if the parameters
    are the same one or not (i.e., duplicate the allow both source and
    generated @param line)
Merge pull request #29 from HBOCodeLabs/rkilgore/regexbugs

bug fixes
update version