Merge fixes for Issue #42

Please run the standard_type.sql script file before you commit parser.py to Prody master.