Merge tag '1.1.2' into develop

1.1.2
Switch to Mavericks & PHP 5.4
Mark up code with Github fenced code blocks

This is to get syntax highlighting on Github.
Bump version 1.2.0
Merge branch 'release/1.2.0'