added: .travis.yml alt build config, tests; changed: filename
Merge branch 'dev'

Conflicts:
	test/test.js