Ignore certain IDEA stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Remove useless file
Replace play-json with Jackson
Fix parsing of ArtifactMetadata JSON
Port remainder to Jackson streaming API
Get rid of json-smart dependency
Simplify
Fix lockfile.java
Try to fix build
Try to fix build
Fix build
Fix build
Fix build
Merge pull request #47 from aknuds1/jackson

Jackson