Fixed incorrect table name in migration.
Tidied up models - removed unwanted validation rules, attribute labels etc.  - and added relations, also added join model table (needed for fixtures command to work)
Tidied up model - removed unwanted validation rules, attribute labels etc.  - and added relations.