Jonoabroad master

@jonoabroad Ran into conflicts with your PR https://github.com/ghostm/lift-omniauth/pull/33 could you verify if that this branch is working correctly. Once it is I will get your changes into master.  Thanks.