updated settings page
Merge branch 'master' of https://github.com/mrdirtbag/nbc_hackathon_2014
updated settings styles