Initial refactoring to a cleaner closure scope with a source map, upgraded grunt dependency to 0.4.0

Alignment