Source rebasing and merging

This is mostly a preparatory pull request. I am just bringing my repo up-to-date with the newest changes.  The API has not been tested yet and hopefully the query-list, search and queue-add commands still work. The commands related to the volume control depend on amixer and as long as it is correctly configured on the computer that will work.