Fixed some merge conflicts and removed a few debug statements
Removed one more debug statement
Merge remote-tracking branch 'origin/sander'