Refactor Account inherits from AccountState
Cleanup for removal of empty lines
Move back mock to src/main
Merge pull request #43 from nicksavers/master

Account inheritance & cleanup