More travis testing
Merge branch 'develop' of github.com:pedrocorreia/Ink into develop

Signed-off-by: Pedro Correia <pedro.a.correia@co.sapo.pt>

Conflicts:
	.travis.yml