Merge pull request #138 from lordhelmut/master

thanks for the contribution!
update and improve installation
add travis
Merge pull request #142 from maraoz/improve/setup

Improve setup
Merge remote-tracking branch 'upstream/master' into api-fixes

Conflicts:
	config/config.js