Some tmux specific changes
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  Cleanup .gitignore