Merge pull request #112 from whirm/test-cleanup

Test cleanup
Make git ignore *~ files.
Point to latest Dispersy branch.
Fix request queue counters.

New fail counter to distinguish between success, fail, and still
trying to download.

Fixes to not count an attempt when swift raises an
exception (i.e. duplicate download).
Merge pull request #117 from boudewijn-tribler/bugfixes

Fix request queue counters.
Updated dispersy submodule ref
Merge pull request #123 from whirm/devel

Updated dispersy submodule ref
API changed, demers community was not upgraded
Merge pull request #124 from NielsZeilemaker/fix_demers

API changed, demers community was not upgraded
Another API change
Merge pull request #126 from NielsZeilemaker/fix_demers2

Another API change
Fix for swift_reseed folder not respecting default_dest_dir
Merge pull request #128 from NielsZeilemaker/devel

Fix for swift_reseed folder not respecting default_dest_dir
Fix for create channel
Don't display 'From' label for SelectedChannelList
Merge pull request #132 from egbertbouman/devel

Fix for create channel + don't display 'From' label for SelectedChannelList
Merge remote-tracking branch 'remotes/upstream/devel' into test-cleanup

Conflicts:
	.gitignore
	Tribler/Core/RemoteTorrentHandler.py
	Tribler/Core/Swift/SwiftDownloadImpl.py
	Tribler/Main/tribler.py
	Tribler/Main/vwxGUI/MainFrame.py