update to curriculum metrics
more updates to metric functions
deleted extra form

curriculum view was not being used
Merge remote-tracking branch 'origin/master' into K-Brizzle