Merge pull request #108 from tiger-swallowtails-2014/styling_stuff

Styling stuff
fixed some styling bugs