Reverting x11extras library in travis
baka-mplayer.md: shorten and simplified the manual
Let's try the non-dev x11extras
Merge branch 'master' of github.com:u8sand/Baka-MPlayer
Upstream patch for FreeBSD port
http://svnweb.freebsd.org/ports/head/multimedia/baka-mplayer/files/patch-src__ui__mainwindow.ui?revision=371210&view=markup
Moved dependency packages to travis-deps and trying to add deb sid
Permissions problems with travis
mainwindow.ui: add audio tracks menu
Audio Track functionality implemented

Also .travis.yml repo reverted
Fix potential problems with X11 code

We assumed that screen is 0; this works some of the time but not all of the time. This should fix cases where it isn't.
Added ShowText; uses OSD to notify on track changes
Merge branch 'master' into playlist-reorder

Conflicts:
	src/ui/mainwindow.cpp
Renamed customlistwidget to playlistwidget