Merge pull request #3 from dancingshell/Kyle

add all types of user accounts
rerouted if lastfm and rdio email dont exist in their respective systems