Merge pull request #182 from rrthomas/master

Add FailoverStyleDict, plus various improvements to StyleDict