Merge branch 'master' of https://github.com/lukebpotato/djangae
Add a get_field_from_column function and use that when determining field type