Update tests to compile on Xcode 6.1.
Merge pull request #31 from nschum/xcode61

Update tests to compile on Xcode 6.1.
Add explicit return statements to examples

See #9
Fix sample code in readme so it compiles
Merge pull request #34 from brandonroth/bug/readme

Fix sample code in readme so it compiles
Merge branch 'master' into refactor

Conflicts:
	CartographyTests/DimensionTests.swift
	CartographyTests/EdgeTests.swift
	CartographyTests/OperatorTests.swift