Refactored commands
Update travis config
Refactor grunt task file