added option() to resolve overlapping column names on joins
cleaned up option()
Merge pull request #64 from oohnoitz/master

added option() to resolve overlapping column names on joins