added merge changes to handlers
Merge branch 'master' of github.com:krakenjs/generator-swaggerize
added update function
fixed linting
Merge pull request #20 from tlivings/master

Added capability for merging api diffs in handlers.