OPENUCB-362: Added image styles and file view modes.
OPENUCB-362: Disallow upload of audio and video files.
OPENUCB-362: Disable inserting audio or video in the WYSIWYG.
OPENUCB-362: Hiding the 'untouched' image style and file view mode.
OPENUCB-362: Fixed several type-o's so that Width 100, Width 200, etc will show up.
OPENUCB-362: Add the 'manualcrop' effect to all image styles.
OPENUCB-362: Add the 'manualcrop' effect to the 'untouched' style as well.
OPENUCB-362: Make sure our variable changes get made on module enable.
OPENUCB-195: Only use custom settings for Width 100, Width 200, etc on Image file entities.
Merge pull request #1 from dsnopek/openucb-362

OPENUCB-362: Open Berkeley Media Feature
[Tested by Caroline](https://jira.berkeley.edu/browse/OPENUCB-362?focusedCommentId=214755&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-214755)
Merge branch 'master' into openucb-195
Merge pull request #2 from dsnopek/openucb-195

OPENUCB-195: Only use custom settings for Width 100, Width 200, etc on Image file entities.

Tested by @cboyden. Merging.