Added a gitignore file that whitelists only the plugins.
Adjusted .gitignore

Added *~ files to ignore list

Added
Merge branch 'master' into edit-entries

Conflicts:
	.gitignore