adding html
adding assets
fixing html and adding js
re-adding some files
converted mongoid to active_record.  4 specs failing still.  Using sqlite3 as an active_record db
reverted back to Model.first() with :conditions
Add User.with_pubic_key for finding/creating users
Use transactional fixtures in specs
Move conditions for finding share into Item model
Use database_cleaner in cucumber
Remove remnants of mongo
Fix authentication
Always truncate database in cucumber
Clean up queries
remove editor files from from gitignore
Remove mongo from travis config
Prepare database before running tests
Avoid autoloading webmock
remove cucumber format to debug travis failures

https://travis-ci.org/github/swordfish/builds/4297740
Merge branch 'master' into adding_clipboard

* master:
  remove cucumber format to debug travis failures
  Avoid autoloading webmock
  Prepare database before running tests
  Remove mongo from travis config
  remove editor files from from gitignore
  Clean up queries
  Always truncate database in cucumber
  Fix authentication
  Remove remnants of mongo
  Use database_cleaner in cucumber
  Move conditions for finding share into Item model
  Use transactional fixtures in specs
  Add User.with_pubic_key for finding/creating users
  reverted back to Model.first() with :conditions
  converted mongoid to active_record.  4 specs failing still.  Using sqlite3 as an active_record db