Merge branch 'master' into remove_basic
authorAaron Hill <aa1ronham@gmail.com>
Sat, 17 Aug 2013 20:14:36 +0000 (16:14 -0400)
committerAaron Hill <aa1ronham@gmail.com>
Sat, 17 Aug 2013 20:14:36 +0000 (16:14 -0400)

Trivial merge