code style and changes to try to keep in line with 3.1
Merge branch 'master' of github.com:Fabrik/fabrik