cuke tests for JSON storage of extra text fields
added feature for document flow
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti
redoing a lot of the public view stufF
Merge branch 'flow'
refactored user_controller, more cucumber tests, better rspec tests. Also made cucumber tests for editing user profile/changing password and recovering password. Made minor changes to gemfile and devlopment.rb that will be used for mailing
fixed conflicts between password-test and master
minor step_definition changes, further user_controller refactoring
adding support for serialized Hashes containing
variable fields for specific text upload types
Some other notes about this commit:
- changed some migration field types to 'text'
    from 'string' because 'text' should be used
    for longer fields
- removed all the old views for individual types
- added a route for handling initial attempt to create
    a new text, before a subtype has been chosen
- removing the author field from the text model, for now
    it can always be added later, though
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti
making cuke tests pass after git pull.  Also, cleaned up some document views
fixed 'db_reset.sh' to drop, migrate, and prepare correclty
merging cucumber tests from rich-text branch
making it so that new documents have a new status when they are submitted
mergine
fixing a bug with the login page
fixing some last minute bugs
fixing a page header reading incorrect information
no cucumber, do not show me the page
fixing some cuke tests so they use the correct step definitions