bugfixes
Merge branch 'working' of https://github.com/jrheizelman/GraphQuil into working