Merge pull request #32 from leifg/reduce_complexity

Reduce Complexity
Merge branch 'master' of github.com:leo-clubs/marozi
Merge pull request #35 from leifg/master

update versions and fix tests
Merge branch 'master' of github.com:leo-clubs/marozi
Merge pull request #36 from leifg/master

update versions
various minor changes
Merge pull request #38 from leifg/readme_cosmetics

Cosmetics around management of project:
Merge branch 'master' of github.com:leifg/marozi
migrate to rails 4.0.0-rc1
rename leo_id to oid
Merge pull request #39 from leifg/rename_leo_id_to_oid

Rename leo_id to oid
remove unnecessary newline