Merge in upstream changes.

This branch will merge in upstream changes from glaszig/soundmanager-rails