Merge pull request #2 from onepercentclub/master

pull gitignore changes
Merge pull request #589 from jfterpstra/salesforce1

Merge pull request #2 from onepercentclub/master