added selection of X and Y plots in recordsweep
resolved conflicting versions of recordsweep
Merge branch 'demo' into HEAD

Conflicts:
	recordsweep/recordsweep.py