Save #1

Initial changes.
Save #2

Restyle Complete
Merge pull request #3 from vantaure/Late-2014-Restyling

Late 2014 restyling