Settings Works again, bug fixes, updates to Firefox Styles
Merge pull request #83 from quandrum/Fixes+Settings

Settings Works again, bug fixes, updates to Firefox Styles
Merge pull request #1 from PSUCapstoneA/master

pull request to update