Fixed code indenting.  Removed commented out code.  Cleaned up code.
Merge remote-tracking branch 'upstream/rails4' into rails4
Removed require 'graph/graphviz_dot' - GraphViz does not appear to be used by controller and is causing errors.
Fixed Expertiza database setup and other bugs (somewhat).  Now should be able to start working on project.
Removed explicit comparison to true.

 On branch jg
 Changes to be committed:
	modified:   app/controllers/signup_controller.rb
Checking in Gemfile.lock
Merged in trivial changes.  Removed an explicit check for true.

 On branch rails4
 Your branch is up-to-date with 'origin/rails4'.

 Changes to be committed:
	modified:   app/controllers/signup_controller.rb
Renamed delete_signup to destory_signup to be better aligned with the Rails conventions.
Forgot to update action_allowed? for destroy_signup
Merge remote-tracking branch 'origin/rails4' into jk
Merge branch 'rails4' into jg
Refactored list to index in sign_up_sheet_controller
Action destroy_signup was missing variables assignment_id and topic_id
Renamed method sign_up to create_signup to be better aligned with Rails convention
Renamed delete to destroy to be better aligned with rails convention (though it does not appear to be in use)
Merge branch 'rails4' into jg
Removed add_signup_topics_staggered as it relied on the view to decide if the assignment had staggered deadlines - better to have the controller decide this.
Merge branch 'rails4' into jg
Moved logic to select which add_signup_topics view is rendered (staggered/non-staggered).
Renamed add_signup_sheet to index and index to index_signup to make it more consistent.  All actions performed by the instructor follow the Rails convention, and actions by the Student are of the form <action>_signup.