don't overwrite known user data with facebook user data
travis: don't leave facebook app id/secret empty by default
Merge branch 'master' of github.com:dothiv/dothiv