Fix some conflicts with other plugins using map files#2

Open

eccentricdevotion wants to merge 2 commits intofromgate:masterfrom

eccentricdevotion:master

Commits on Oct 2, 2014

Don't rename the map if the album name returns an empty string
eccentricdevotion
committed
Add a config list option to reserve map ids
eccentricdevotion
committed