Merge branch 'master' into remove_basic
authorAaron Hill <aa1ronham@gmail.com>
Sat, 17 Aug 2013 11:22:27 +0000 (07:22 -0400)
committerAaron Hill <aa1ronham@gmail.com>
Sat, 17 Aug 2013 11:22:27 +0000 (07:22 -0400)

Trivial merge