Merged small updates which take care of some bootstrap transition problems, added templates to the grunt watch list