fixing the last commit
Merge branch 'master' of http://github.com/blackchair/parley
pushing a less, well, broken commit
Merge branch 'master' of http://github.com/blackchair/parley