Ignore clock signals when using Midi Mapping Wizard, fixes https://bugs.launchpad.net/mixxx/+bug/1176184
Added Michael Sawyer to contributor list. Thank you very much!
fix typo that causes a scons exception when changing to a new branch, complainig about an existing chache/custom.py file
delete .sconsign.branch file after saving files to cache to avoid a new copy after a following  exception
fixed i18n dependency when compiled with detached HEAD
Merge remote-tracking branch 'upstream/master' into recording_improvements

Conflicts:
	build/mixxx.py
Style improvements.