Merge branch 'travis-ci'

https://travis-ci.org/cmlh/Maltego-Recorded_Future/builds/16914948
Feature @GitHub recommendations for .gitignore Mac OSX

https://github.com/github/gitignore/blob/master/Global/OSX.gitignore
Merge branch 'git_config' into travis-ci