ignore gem files
Merge branch 'json' into integration