Add Expire Module
Add file overrides and variables
Set var defaults
Update defaults, debug site cc button, add cache clear for image styles
Fixed vsite_vocab machine name generation for non-latin languages
See Issue #4582
correct flavor name in vsite_preset export #4431
Worked on file view modes #4607

Removed the view modes were weren't going to use.  Added title.  Added os_files_file_view to control how title, teaser, and full look when showing files.

@dancabral, could you add this new file to the sprite and fix up the css?  I got a good start on it - should just need finishing touches.
Fix merge confilcts
List of videos #4607

Updated list of vids.  Full gets embedded video.  Teaser gets thumbnail that opens embedded video in a colorbox.  Title gets nothing.
Added sv list image and video plugins #4607

`git commit -a` ignores new files.  WHEN WILL I LEARN?
File view modes #4607

- Update hook fixes teaser lenght.  160 instead of 600.  Looks a lot saner, but we could probably even go lower.
- Image view modes gained full image in full mode, and os_file_small in teaser mode.
- Added sort_random to files.  I don't know if this is necessary, but the same code from nodes works so it was a one liner to include.
Fixed theme function.  Added missing html param #4607
Alias is not valid if the path is used without the purl.
Minor fixes.
White space remove.
We need to check for nodes and not terms.
Merge branch 'SCHOLAR-3.x' into 4430
Merge pull request #4598 from openscholar/4431-flavorname

correct flavor name in vsite_preset export #4431
Merge branch 'SCHOLAR-3.x' into 4607-file_view_modes

Removed the layout select allowing for grid mode.  Moving that to next relesae anyway.  #4607

Conflicts:
	openscholar/modules/os/modules/os_sv_list/plugins/os_sv_list.inc
Merge pull request #4624 from openscholar/4430

Improve user control over caching