Tranyi/blazer @ bb66f47a072d44753aeb01729c754d1a11e73f4c

Andrew Kane 4b46ced887 Merge branch 'cancel'		8 lat temu
..
assets	a3d21b87f6 Added ability to cancel queries	8 lat temu
controllers	4b46ced887 Merge branch 'cancel'	8 lat temu
helpers	ee8c6c0dee Fix to no formatting with delimiter columns named id or starts with id (#74)	8 lat temu
mailers	98dcfe4fca Added comment about reply_to	8 lat temu
models	f07fe4e54a Fixed errors	8 lat temu
views	4b46ced887 Merge branch 'cancel'	8 lat temu