More hours lost cleanup
Merge pull request #20 from thatRailsGuy/master

More hours lost cleanup