Added support for noConflict coming in 1.1/1.2 

Added a noConflict option to specify an alternative reference to `angular`. Here's the noConflict pull request that got merged into 1.1:
https://github.com/angular/angular.js/pull/1535/files