Correctly resolves comma-separated, nested styles

Resolves #35
Merge branch 'craiglabenz-master'
Minor version bump for pypi release