Mjordan 1.x

Rolled in Mark Jordans changes. Added some commands to get travis testing more PHP versions.