Security exploit patch:
http://www.securelist.com/en/advisories/52134
http://rack.github.com/
Merge branch 'master' of github.com:variations-on-video/hydrant

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of github.com:variations-on-video/hydrant
Merge branch 'master' of github.com:variations-on-video/hydrant
Only use /usr/bin/git or /usr/local/bin/git
Merge branch 'master' of github.com:variations-on-video/hydrant
the media object may not be valid at the time the file is uploaded
Update felix to 277edc1
Merge pull request #25 from atomical/duration_not_set_bug

Duration not set bug
formatting the duration: VOV-1167:  have a space between title the duration. Duration should be in formats 00:00:00. 0:01 = 1 sec, 1:01 = 1 min 1 sec, 10:01 = 10 min 1 sec, 1:10:01 = 1 hour, ten min, 1 sec, 11:10:01 = 11 hours, 10 min, 1 sec.
Merge pull request #26 from atomical/format_duration_vov_1167

formatting the duration: VOV-1167:  have a space between title the durat...
Updated felix to 2a1c2b3
Fix a slew of MODS issues: 
* Definitely VOV-1106, VOV-1173, VOV-1172
* Probably VOV-1108 and VOV-1174
* Possibly VOV-1171