Additional fixes from Judy, Final final? updates
Merge 2013 changes forward to 2014
Reorganize Other University Programs based on Brooke's instructions.
Adding changes to Libraries
Move OUP files to "other" directory and change "and" to "&".
Merge pull request #101 from tsteiner/reorg-of-other-programs

Reorganize Other University Programs based on Brooke's instructions.
Rename some filenames for consistancy and map them in edition.config.inc.php.
Merge pull request #103 from tsteiner/reorg-of-other-programs

Rename some filenames for consistency and map them in edition.config.inc.php
Merge remote-tracking branch 'upstream/master' into 4-year-plans