updated with sfdc blah blah blah

self-explanatory
Merge pull request #183 from gigneil/patch-1

License updated to include attribution to Salesforce.com
Merge branch 'develop' of github.com:trigger/trigger into develop
ACL parser refactoring by Sandia NL interns.