Adds puppet/modules_contrib to .gitignore
First pass at Puppet Librarian.
Fixes merge conflict.