changes
Merge branch 'dev' of github.com:gentnerlab/pyoperant into dev

Conflicts:
	pyoperant/panels.py
Merge branch 'dev' of github.com:gentnerlab/pyoperant into dev
that's all
fixing bugs