merging
Merge branch 'master' of http://github.com/blackchair/parley
some more dialog updates, added preset buttons/images, also added some error handling