Merge branch 'dropbox'
Added mean weekly spend
Removed bad tests, these needs re-creating
Should upload files to github on success
Merge branch 'master' into dropbox
test commit for travis