Updated to reflect changes in https://github.com/lightblue-platform/lightblue-core/issues/116
Modifications to accommodate values vs annoatedValues
minor fix
make changes to match core
Merge branch 'master' of https://github.com/lightblue-platform/lightblue-mongo into enum2
bump lightblue test version
Merge pull request #45 from dcrissman/enum2

Fixes https://github.com/lightblue-platform/lightblue-core/issues/116