refactored incoming/outgoing relationships, added filter by type
deleted generated fixture file which shouldn't ever be commited
Merge remote-tracking branch 'origin/develop' into develop
added relationship tests to enumerated type controller spec