Fix racecondition triggered KeyError in our DebugThread.
scanner: Support symlinks
Fix Python 2.6.0/2.6.1 support (fixes #302)

Conflicts:
	docs/changes.rst
Use bytestrings for the keys of **kwargs dicts

Python < 2.6.5rc1 does not work with unicode keys. Fixes #302.
More **kwargs key fixing (#302)
scanner: Fix optparse on early 2.6 (#302)
js: Add a package.json to simplify JS dev env setup
audio: Update mixer track selection logic (fixes #307)

We now ensure that the track we choose has one or more volume channels we can
control. This change also fixes that fact the MIXER_TRACK setting would not
work if we happened to find a track that was flaged as MASTER OUPUT before
finding the right label, so far no one has reported this as an issue.
mpd: Use bytestring for **kwargs key (#302)
Update changelog with mixer track selection change.

Conflicts:
	docs/changes.rst
mpd: Make request handler **kwargs keys bytestrings (#302)
Fix more unicode kwargs dict keys (#302)
core: Add 'include_tracks' argument to 'get_playlists()'

Conflicts:
	docs/changes.rst
Don't exit autotest if a test fails
models: Add Album.images field (#263)
models: Add Track.disc_no (#286)
models: Add Album.num_discs (#286)
models: Support serialization of lists of strings
Fix more unicode kwargs dict keys (#302)
Fix one more kwargs dict (#302)