Now with more requires.
Merge pull request #1009 from NatTuck/require-nokogiri

Now with more requires.
Set file permissions for uploaded files.
Merge pull request #1010 from NatTuck/upload-permissions

Set file permissions for uploaded files.
Merge remote-tracking branch 'upstream/master' into jp592