Merge pull request #4280 from jmarshallnz/settings_cleanup
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 27 Feb 2014 00:41:46 +0000 (19:41 -0500)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 27 Feb 2014 00:41:46 +0000 (19:41 -0500)
Settings cleanup


Trivial merge