merge latest changes from on_spray-can_1.1 and update to spray 1.0-RC1