For #65, use maven-bundle-plugin to build JAR as OSGi bundle
Merge pull request #66 from pholser/feature/osgi-support

For #65, use maven-bundle-plugin to build JAR as OSGi bundle
Updating change log
Upversion dependencies in POM
Master becomes 5.x
Building with/targeting JDK 7
For #62, now that we're abandoning Java 5 for 5.x.
Merge branch 'EdJoJob-master'
Java 7-ifying
formatting
formatting
For #48, de-dupe the unmodifiability for OptionSet.nonOptionArguments()
Formatting
For #65, include a Bundle-Vendor value in manifest.
Merge branch '4.x'
[maven-release-plugin] prepare release jopt-simple-4.8-beta-1
[maven-release-plugin] prepare for next development iteration
Merge branch '4.x'

Conflicts:
	pom.xml
[maven-release-plugin] prepare release jopt-simple-4.8
[maven-release-plugin] prepare for next development iteration