additional styling and fix failing tests
Merge pull request #22 from tiger-swallowtails-2013/styling

additional styling and fix failing tests