renamed vars to make a little more sense.
removed unused var.
removed warnings.
Merge branch 'master' of https://github.com/rlsutton1/VaadinUtils.git