Merge.

diff --cc TODO
index 221d2c2858542c2de9997620dd6fa3edd1a3efe8,bd5bc200883231de590bba0a26ca8388ed7fe713..0a120fa479978cc12db3c0db34c6fc1e05473e2d
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -1,4 -1,24 +1,26 @@@
 +Look at http://liblqr.wikidot.com/en:manual
++
+ EC2
+ 
+ Small instance $0.085 ph
+ Sintel Trailer 1080p @ 200000 Mbps
+ 1247 frames @ 24fps ie 51.96s
+ Took 1h20 to encode
+ 
+ High-CPU medium $0.186 ph
+ Sintel Trailer 1080p @ 200000 Mbps
+ 1247 frames @ 24fps ie 51.96s
+ Took 23m to encode
+ 
+ High-CPU extra-large $0.744 ph
+ Sintel Trailer 1080p @ 200000 Mbps
+ 1247 frames @ 24fps ie 51.96s
+ 
+ 
+ Transfer in free
+ Transfer out $0.120 per GB
+ 
+ 
  Port DVD rip
  
  Write still j2ks straight to a MXF.