Fixed a problem with mpd and with history saving
Removed un-needed bundles and made an attempt at nicer Makefile editing.