GitHub login/access token storage
Merge branch 'github_tokens'

  - Bundle install to fix
Conflicts:
	Gemfile.lock