Merging funct filter in fingerprint filter
Merge pull request #1122 from electrical/punct_to_fingerprint

Merging funct filter in fingerprint filter
rename PUNCT to PUNCTUATION
Merge pull request #1123 from electrical/punct_to_fingerprint

rename PUNCT to PUNCTUATION
Fix for the awk version in debian 7.3 (by not using awk)
Merge pull request #1125 from fayep/deb73awkfix

Fix for the awk version in debian 7.3 (by not using awk)
Merge remote-tracking branch 'upstream/master'