cleaned up setup code
Merge branch 'master' of https://github.com/johndoherty/cs229-project