Fix twisted 13.1 compat -- the _parse() function was replaced by the _URI class
Fix #2355 previous fix was incorrect - thanks Thomas Hipp
Merge branch 'master' into HEAD
Fix #2335 : IPC lockfile issue preventing start of deluge-gtk
Fix #2367 :  Private Flag not showing as ticked/checked in DelugeStart theme
Fix #2371 : Add StartupWMClass to desktop file
Fix #2381 : Allow silent uninstall for Windows package
Fix #265 : Add new Remaining column
Fix web ui showing total_size rather than total_wanted for Size column