Merge pull request #8 from themullinator/master

Schema and template updates
some gemfile thing again
Merge branch 'master' of github.com:polyfish42/PeopleDB
made the second search bar look bootstrappy
added csv upload in seed file, remember to reindex solar when you do this
Merge pull request #9 from themullinator/master

Rename 'role' to 'team'
added avatar avatar instead of me
Merge branch 'master' of https://github.com/themullinator/PeopleDB into themullinator-master
Merge branch 'master' of github.com:polyfish42/PeopleDB
Merge branch 'master' of github.com:polyfish42/PeopleDB

Conflicts:
	app/models/employee.rb
	app/views/employees/_filter.html.erb
	app/views/employees/_form.html.erb
	db/schema.rb
small date format change
added aws storage for profile pics. still acting like I'm going to put this on heroku. Will that be a problem with ldap?
adding cropping, let's hope this works.
Merge branch 'master' of https://github.com/themullinator/PeopleDB into themullinator-master
Matt's commits
fixed a whiny nil, learned what a whiny nil is, merged crop feature, doesn't work. boom.
Schema being all stupid