Added some time info to the videos entry
Added in the template and javascript code needed for start and end times for youtube videos
Cleaned up video types passed to template
Cleaned up javascript
Removed json include as it was not being used
Fixed issue with external URL video type in template
Added start and end time information for videos into the template
Cruft removal
Fixed merge conflict
Merge branch 'video-adding-start-end-times' into develop