Added custom analysis function
Merge branch 'master' of https://github.com/ineuron/NeuroDAQ-Analysis

Conflicts:
	analysis/__init__.pyc
	analysis/auxfuncs.pyc
	analysis/basic.pyc
	analysis/eventdetection.pyc
	analysis/smooth.pyc
	analysis/toolselector.pyc
	util/__init__.pyc
	util/h5funcs.pyc
	util/mplfuncs.pyc
	util/pgfuncs.pyc
	util/tablefuncs.pyc
	util/treefuncs.pyc
	widgets/AnalysisSelectWidget.pyc
	widgets/AnalysisStackWidget.pyc
	widgets/FileBrowserWidget.pyc
	widgets/MplWidgets.pyc
	widgets/NeuroWidget.pyc
	widgets/TabWidget.pyc
	widgets/__init__.pyc
	widgets/h5Widgets.pyc