Added support for custom ViPR headers
Merge branch 'vipr-container-opts' of git://github.com/jasoncwik/joss into jasoncwik-vipr-container-opts

Conflicts:
	src/main/java/org/javaswift/joss/model/Container.java