added screensaver wake
merge conflict resolved
add jruby serialport
updated bundle
merged fix