Fixes for OCL
Merge branch 'master' of github.com:veg/hyphy

Pulling down current upstream
Merge branch 'master' of github.com:veg/hyphy