[Merge] lp:~noskcaj/ubuntu/trusty/gnome-tweak-tool/3.10.1 into lp:ubuntu/gnome-tweak-tool

[Logan Rosen]

Review: Needs Fixing

Text conflict in gtweak/utils.py
Text conflict in gtweak/widgets.py
2 conflicts encountered.
-- 
https://code.launchpad.net/~noskcaj/ubuntu/trusty/gnome-tweak-tool/3.10.1/+merge/200482
Your team Ubuntu branches is requested to review the proposed merge of lp:~noskcaj/ubuntu/trusty/gnome-tweak-tool/3.10.1 into lp:ubuntu/gnome-tweak-tool.