pandora merge

@skmp I can't seem to get to it on mobile to see where the override is lol. I've been using the info option for about 2 weeks without issue. All that is broken (read: missing) is name prediction when it isn't the "expected" format