basic file upload functionality
added more seed data
aligned js templating with new schema
moving xpath to data_file model
Merge branch 'master' of https://github.com/OregonShakespeareFestival/captioncast into views
improved the uploader form
Merge branch 'master' of https://github.com/OregonShakespeareFestival/captioncast

Conflicts:
	app/controllers/upload_controller.rb
	app/models/data_file.rb
	app/views/upload/uploadfile.html.erb
Merge branch 'views'

Conflicts:
	app/controllers/upload_controller.rb
	app/models/data_file.rb
	app/views/upload/uploadfile.html.erb
small fix to upload controller - still needs work