Refactoring - more sensible naming conventions.
Merge branch 'master' of github.com:ever-been/everBeen