Tidy up Gin modules
Merge branch 'master' into tidy-gin

Conflicts:
	src/main/java/com/fave100/client/gin/ClientModule.java
Merge pull request #137 from yissachar/tidy-gin

Tidy up Gin modules