Prepended print statements to reflect where they came from in code. Removed test.bat since nobody uses windows
Merge branch 'master' of https://github.com/jakemmarsh/alpaca-tracker