Merged several pull requests, added grunt support for creating a bundle