Reworked the way options are set for the new AngularCache.setOptions method
Merge branch 'develop'

Conflicts:
	src/angular-cache.js
Working on setOptions
Merge branch 'develop'
Got setOptions mostly working.
Merge branch 'origin/feature-setOptions'
Nearly done with setOptions
Updated version of angular.js that's loaded in the tests
Finished unit tests for AngularCache.setOptions().
Uncommented the remainder of the tests and re-built the project.
Merge pull request #20 from jmdobry/feature-setOptions

Feature set options