Merge branch 'master' of github.com:wordnik/swagger-codegen

Conflicts:
	README.md
	bin/generate-js-lib.sh
	bin/generate-python-lib.sh
	src/main/java/com/wordnik/swagger/codegen/LibraryCodeGenerator.java
	src/main/java/com/wordnik/swagger/codegen/config/common/CamelCaseNamingPolicyProvider.java
	src/main/java/com/wordnik/swagger/codegen/config/common/UnderscoreNamingPolicyProvider.java