Commit?
Had to fix some stuff by adding things from previous commits due to the commit reset
Merge pull request #22 from greggjs/greggjs

Fixed things from the previous screw up on the master.