Merge remote-tracking branch 'owen2/master'
fixed regexes (mostly escaped special chars)
fixed sln regex
formatted regex strings
Merge pull request #4 from MadBender/master

regex fixes