Merge remote branch 'upstream/master'

Conflicts:
	README.markdown
	js/jquery.keyboard.js