Merge pull request #97 from MartyBurns/master

commented out bad line of code due to OAuth library change; non-used fun...
Merge pull request #98 from MartyBurns/master

removed service_kind table from database and corresponding initializatio...
Merge remote-tracking branch 'upstream/master'