Update .gitignore

- remove custom ignores (place them in your home!)
- change ignoring vendor files, not dir! (capifony will thanks)
- reorder entries alphabetically
- add web/css and web/js
- remove composer.lock
Fix vendor in .gitignore
Merge pull request #2 from garak/patch-2

Update .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore