Fixed some errors that existed in feature extraction having to do with
average syntactic complexity and updated feature name strings in
intrinsic evaluation. Also updated db version number to 5.

Fixed a syntax error in syntactic_complexity_average

Turns out the errors weren't fixed. But now they are.
Resolved conflicts