Functionality to re-register appium with grid

Fixed Travis build issues

fixed spacing

fixed spacing
Merge branch 'master' of https://github.com/swapna-chennadi/appium

Conflicts:
	grid_register.js