working on basic crud for bus/team concepts
basic request/approve team member working
Remove rolify
Add conductor
Create milestone
Add Investor
CLean up
All kinds of users can log in
add approval attributed to users and conductors
Approve
Move user models around. Base is omniauthable.
Add more stuff
Associations
Merge branch 'team_and_bus_models'

Conflicts:
	app/views/layouts/application.html.erb