Missing apostrophe in sample code.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge remote-tracking branch 'upstream/master'
Document the "moveDJ" method which was implemented but apparently never
added to the README.
Correct upper-case in documentation for removeDJ and moveDJ methods.
Clean up old merge conflict that I missed.
Merge.