Fix a couple issues relating to block placement. Fixes #58.
Merge branch 'patch' of http://github.com/graniteteam/granite into patch