Added more association definitions to models
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	Gemfile.lock
Merge pull request #21 from stevemcquaid/sean

Sean