work to introduce the ability to concatenate user provided jvm.options with the default options.
Merge pull request #23 from Samuel1989/master

work to introduce the ability to concatenate user provided jvm.options with the default options.
Documentation changes
fixed conflicts that occured in merge