Merge branch 'master' of github.com:spumko/hapi

Merging upstream
Merge branch 'master' of github.com:spumko/hapi

Merging upstream
Adding gitattributes to normalize line endings
Merge pull request #719 from wpreul/master

Adding gitattributes to normalize line endings