hex is already a string removed needless conversion, readme updated with instructions to opt out of erd generation, rake task for erd generation updated
Merge branch '1129_user_has_api_key' into 1130_user_sees_api_settings_page