fixing crash by casting phi vars
Merge branch 'master' into fix_crash
Minor changes
Regression passes.

  - BUT octane test fails...
Unifying before joining types from if branches
Fixes in join types and cleanup of todo
Adding some left out tests
Merge pull request #82 from UCSD-PL/fix_crash

Another try at Fixing the Fixpoint crash issue