get time-based video comments to work
clean & get replay functionality
Adds custom URLs via FriendlyID
fix ugly non existing capsule display
fix error message on capsule edit
Put WebWork in an iframe
Merge branch 'master' into videolectures

Conflicts:
	app/views/lectures/show.html.erb
Fixed up some minor bugs, rework some of the video code, prepping edit, update, and destroy for videos and video_texts
Gitignore is now working, and added a timestamp to video texts
Minor fixes
Work on AJAX form for adding/editing video annotations
Merge branch 'videolectures' of github.com:grahamcracker/grapefruit into videolectures

Conflicts:
	app/views/video_texts/_edit_video_text.html.erb
Merge branch 'master' into videolectures
Merge branch 'bugfixes'
Move script
Finish sidebar

AJAX video text creation/updating/deleting like Austin's problem set editor
Merge branch 'master' into videolectures

Conflicts:
	app/assets/javascripts/application.js
Some comments, code cleanup, and fixing var declarations
Fix potential bug
Don't show the Courses You Instruct section if you don't have any