Corrected bugs to ensure that project compiles
Merge branch 'master' of https://github.com/icpcpp/edward