Updated Schema to have better unique names for column names in M-M tables.
In particular, fixes cases where a pivot table is linked to the same table twice. This would generate the same property name (i.e. the foreign key's table name) for both columns.
This is now fixed to append the column name if the column name is not derived from the table name
(i.e. "my_account" + "my_account_id" -> "my_account"   VS   "my_account" + "your_account_id" -> "my_account_your_account")
Originally, the second case would have generated "my_account_id" which would have clashed with the first case.
Merge branch 'master' of https://github.com/brokencube/automatorm