first commit
Merge branch 'master' of https://github.com/ndlib/honeycomb

Conflicts:
	.gitignore
First commit of CAS authentication.

* Added Devise, CAS, and ldap related gems.
* Created User model, controller, migration.
* Added Devise route for Users.
* Updated autoload_paths in application.rb to find stuff in
  models/active_record folder.
* Set CAS related paths to config in development.rb

Does not complete DEC-20, but starts work on it.

dec-20#
Fix CAS authentication error message on successful login.

* Fixed login error message by following instructions here:
  https://github.com/nbudin/devise_cas_authenticatable/wiki/Suppress-devise-login-flash-errors
* Set Collections#index as default path.

dec-20#
Remove unwanted test unit directories
Add CAS configs to test environment
Merge branch 'master' of https://github.com/ndlib/honeycomb
added the tests for the item title verification.
added some more specs to the save item spec.
ignore vendor bundle.
updates to the syntax of the save item specs
fix turbo links in the data tables init script.
fixed the items controller tests.
update to use a release candidate of simple form that supports bootstrap 3
updated items to not delete existing images.
Update gemfile, guardfile and spec helper so that guard only runs via
spring, and not spring and guard-rspec

Conflicts:

	Guardfile
	spec/spec_helper.rb
Merge branch 'master' of https://github.com/ndlib/honeycomb

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Guardfile
	app/assets/javascripts/application.js
	app/assets/javascripts/datatables.js.coffee
	app/assets/stylesheets/application.css.sass
	app/assets/stylesheets/bootstrap_and_overrides.css
	app/models/item.rb
	app/services/save_item.rb
	app/views/items/_form.html.erb
	app/views/items/new.html.erb
	app/views/layouts/application.html.erb
	db/schema.rb
	public/images/favicon.ico
	spec/services/save_item_spec.rb
	spec/spec_helper.rb