Merged CERN changes for KiCAD OSX Builder,
added the -C flag to build from CERN KiCAD branch.

KiCad patching unneeded,as it's integrated in bzr,
fixed a little typo with KiCAD dir.
Updated README.md
Merge remote-tracking branch 'upstream/master' into wxPython_2.9.5_debug

Conflicts:
	build.sh