updated ruby version for rvmrc
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added new bookmarklet
Merge remote-tracking branch 'blackfalcon/master'