Changed speed
Took out fist stopping motion
Fixed merge conflict: At first sight, the idea of any rules or principles being superimposed on
the creative mind seems more likely to hinder than to help, but this is
quite untrue in practice.  Disciplined thinking focuses inspiration rather
than blinkers it.
		-- G. L. Glegg, "The Design of Design"
Merge branch 'master' of https://github.com/projectzen/air-dj