Merge OAUTH library & App.net code