Squashed commit of the following:

commit 70863bd41f149fb4a0d39c8fdff97b025d1c08f9
Author: Miguel Alatorre <miguel@endpoint.com>
Date:   Wed Feb 27 18:31:42 2013 -0500

    Updated create_dictionaries to handle "name" dictionaires.