Some re-ordering for npm and grunt