Fix #27 for hotfix/3.1.1

[rwasef1830]

@roji Same as #36 but for hotfix/3.1.1

I changed the code style a bit (not using C# 6 expression bodies and not "var") to match the surrounding code.

[rwasef1830]

whoops missed a few spots, will fix, force push and say when ready.

[roji]

OK, let me know when it's ready.

FYI in 3.1 I use var and all C# 6 features wherever possible. EF6.Npgsql is a bit less clean than Npgsql itself but it's a good idea for new code to do that. Another thing is that it's better for code merged into dev and into hotfix/3.1.1 to be as close as possible (aside from actual conflicts of course), to make later comparison easier.

[rwasef1830]

Ah ok then, I'll make it as close as possible then.

[rwasef1830]

Looks good now. I think it is OK for merge.

[roji]

LGTM, @rwasef1830 feel free to merge whenever you want.

Also, take a look at the list of open issues. If you want we can release 3.1.1 right away with this fix, or we can wait if you want to do some more work.