gitignore
Merge branch 'upstream/master'

Conflicts:
	.gitignore
Merge branch 'onyg/master' into orderbird/master
Merge branch 'onyg/master' into orderbird/master
SerializerObjectField now accepts exclude argument for surpressing "default" fields from base class
Merge pull request #2 from orderbird/master

made SerializerObjectFields accept exclude argument on init