Merge branch 'travisj-master'
.gitignore
ignoring vim swp files