Some changes to regex. Currently unusable code is commented out.
Merge branch 'master' of https://github.com/johnolos/classify