fixes and cleanup
Merge branch 'master' of git://github.com/kaerus-component/arango