Merge branch 'hotfix/36'

Close #36
Added PHP 5.6 and HHVM to travis.yml
Merge pull request #37 from Nyholm/patch-1

Added PHP 5.6 and HHVM to travis.yml
Merge branch 'hotfix/37' into develop

Forward port #37