Better gitignore
Moved templates
Grunt, bower, update package again