Merge pull request #1122 from electrical/punct_to_fingerprint

Merging funct filter in fingerprint filter
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 pull request #1126 from kurtado/1.4.x-changelog

1.4.x changelog
clean trailing whitespace.
Merge pull request #1128 from miah/whitespace

clean trailing whitespace in elasticsearch output modules.