Merge master changes instead of rebasing

Previous rebasing doesn't play well with an upstream copy It's clean and
nice on the local work environment but I have to stop rebasing and push
--force now that others start using the repo...
Update README : Info on Unity / memory req. + Misc.