Renamed 'type' attributes in models and migrations.
Still can't figure out Gear address
Merged callout controller