Round to the nearest point when doing layout calculations
Merge branch 'master' of github.com:atomicobject/teacup into atomicobject-master

Conflicts:
	lib/teacup/calculations.rb