Ensuring that a singular model name is set for use in controllers when scaffold is passed a plural model name

[#3062 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>