modify description of changes
Merge branch 'master' of https://github.com/sean-adams/dataslayer

Conflicts:
	src/options.html