Update README.md
Merge branch 'master' of github.com:encuestame/enme-intern-test

# By Juan Picado (@jotadeveloper)
# Via Juan Picado (@jotadeveloper)
* 'master' of github.com:encuestame/enme-intern-test:
  Update README.md

Conflicts:
	README.md
New nom configuration, more sauce labs environments, added jshint, grunt task, ENCUESTAME-651
Added grunt-cli on travis conf
ENCUESTAME-660 Removed Android environment, not well supported by sauce labs