Merge pull request #80 from duncannz/master

Major repo cleanups
Fix merge again.