Merge branch 'v2.0' into v2.0-umd-browserify

Conflicts:
	build/mobify.js
	build/mobify.min.js
Merge pull request #248 from mobify/v2.0-umd-browserify

AMD/Require.js to UMD/Browserify
Merge branch 'v2.0' into v2.0-rename-method

Conflicts:
	build/mobify.min.js