Jquery noconflict fix (bug fixes for #396)

Bug fixes for 32f925a2d185a573140fd97002168a78765451ce that made rickshaw not compile, addendum to #396