Tesla, who presumably know a fair bit about this, say that battery energy density has been improving at a rate of 7-8% a year. http://www.eetimes.com/electronics-news/4370061/World-on-cus...
http://www.akbars.net/images/battery%20energy%20density.png
... would imply that this is overoptimistic by at least 2x.