Added omniauth for rdio
resolved merge conflicts
Merge pull request #30 from paulhyunkim/aarontsangbranch

Aarontsangbranch