BF: removed deprecated .rvmrc in favour of .ruby-version and .ruby-gemset
BF: use JS cust$om variable value if set and data-tracking-value doesn't exist (resolves #17), swapped prop1 with prop12 (resolves #18), and version bump for a RC
Merge pull request #19 from bjfletcher/master

Use JS custom variable value, swapped prop1 and prop12, version bump for a RC
BF: added analytics for persistent login
BF: version bump for another release candidate
Merge branch 'master' into feature-media

Conflicts:
	_site/changes.html
	_site/dist/js/analytics.js
	_site/index.html
	_site/test.html
	_site/test/reports/TEST-AnalyticsTest-Debug.xml
	_site/test/reports/TEST-AnalyticsTest-Errors.xml
	_site/test/reports/TEST-AnalyticsTest-Events.xml
	_site/test/reports/TEST-AnalyticsTest-LinkClick.xml
	_site/test/reports/TEST-AnalyticsTest-ManualTrigger.xml
	_site/test/reports/TEST-AnalyticsTest-PageLoad.xml
	_site/test/reports/TEST-AnalyticsTest-Search.xml
	_site/test/reports/TEST-AnalyticsTest-Variables.xml
	dist/js/analytics.js
	test/reports/TEST-AnalyticsTest-Debug.xml
	test/reports/TEST-AnalyticsTest-Errors.xml
	test/reports/TEST-AnalyticsTest-Events.xml
	test/reports/TEST-AnalyticsTest-LinkClick.xml
	test/reports/TEST-AnalyticsTest-ManualTrigger.xml
	test/reports/TEST-AnalyticsTest-PageLoad.xml
	test/reports/TEST-AnalyticsTest-Search.xml
	test/reports/TEST-AnalyticsTest-Variables.xml
updated with code from current master