Don't bug the IRC channel for feature branches
- Restored changes
Merge branch 'master' into feature_windows_select_server
- Restored travis settings