Merge pull request #1 from shawnbutts/settings

Add support for settings files
Updated configuration files. 

Thanks to shawnbutts
Credited Shawn Butts
Fixed spacing