Added .vim.custom to .gitignore
Added author_name field to Plops table
Merge branch 'master' of github.com:angusiguess/plungr

Conflicts:
	db/schema.rb