Removed 1 too many lines from the make file, moved entity_view_mode back into contrib folder