oauth2 seems to work now
Merge branch 'master' of github.com:atmosx/pritory

Conflicts:
	pritory.rb
Merge branch 'master' of github.com:atmosx/pritory
minor changes