undoing travis
Revert "undoing travis"

This reverts commit c91f005b02249186a120950b272cc49716af1b96.
Merge branch 'master' of github.com:banguero/winjs

c5ebcd21ca99c8c3157eadc4588286c11d9bf.

Conflicts:
	.travis.yml