Add test for, and fix #12
Merge branch 'master' of git://github.com/bengourley/pliers

Conflicts:
	pliers-cli.js
Relinting to confirm to coding standards