Edit .gitignore, .travis.yml
Merge branch 'hotfix/20140122-travis'