Added bits from https://github.com/github/gitignore/blob/master/SugarCRM.gitignore
Merge remote-tracking branch 'upstream/master'