Added new enrollment terms, some academics

This includes terms from registration, conflict resolution, services,
food services, and academic help.
Fixed line 149, nixed line breaks at the bottom
Added external sites and athletics categories
Merge pull request #7 from HCPSS/165-lines

Looks good.