Updated RegEx patterns
Added new RegEx patterns
Removed a few things
Updated config
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/config.yml
Updated config.yml