#432: no longer showing description when one is not provided by the data source
Also changed the field names to all start be uppercase rather than just description being that way. (tempalte and display now consistent)
Merge remote-tracking branch 'upstream/master'
#432: improved error handling
also minor improvements to variable decleration and whitespace
Merge pull request #434 from dsteinbrunner/master

#432: no longer showing description when one is not provided by the api