Completed Mod2 work.

Added Video & Category Models and added test and shoulda_matchers.  In addition, corrected video and category association and dropped a join table.