Moving json to lib/
Refactoring
Merge branch 'master' of github.com:josefnpat/vapor