I haven't seen the movie yet but I keep hearing that it's great. I actually trust your judgement (unlike my little bro's) so I guess I've got to believe it now that the movie actually is good :D

Neville/Luna was definitely in the books, which is why it was disappointing to read from some JKR interview where she said that no, they wouldn't match at all and defs never a couple. I think he ended up marrying Hannah Abbott.