(0.6.5-beta) Merge branch 'develop' into beta
(0.6.6-beta) Merge branch 'develop' into beta
Small fix to Scrobbler.get_request_parameters
Updated README.md - Bugs should be reported to the github issue tracker.
Updated README.md - Bugs should be reported to the github issue tracker.
Updated README.md - Bugs should be reported to the github issue tracker.
(0.6.6.1-beta) Merge branch 'develop' into beta

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
(0.6.7-beta) Merge branch 'develop' into beta

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
(0.6.8-beta) Merge branch 'develop' into beta

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
(0.6.10-beta) Merge branch 'develop' into beta

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
(0.6.11-beta) Merge branch 'develop' into beta

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
(0.6.12-beta) Merge branch 'develop' into beta

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
(0.7) Merge branch 'beta'
Updated README.md to be a bit more clear and provide downloads to master, beta and develop branches.
Merge branch 'trakt_master'

Conflicts:
	README.md
Updated labels and ordering on settings to be a bit clearer.
[Issue #64] Added force legacy preference to settings
[Issue #60] Updated ASIO to resolve issue on unix systems without /proc/*/fd/*
[Issue #62] Fixed bug where an incorrect number of items were returned from iterget on errors
[Issue #61] Fixed an issue when checking watched/rated responses are valid, made syncing more resistant to network issues.