minor mods
put in mappings to master, still buggy though
Merge branch 'master' of https://github.com/sugarcubes/SugarCubes  with current mapping and adjustments to TraktorPlay

Conflicts:
	Mappings.pde