alim/ignition — pull request #90 by anotherjazzman (2014-08-19 18:17:39+00:00)
Title: Updated conflicts

Updated the conflicts that existed in the previous pull request.