updated requirements
made some minor bug fixes
commented out a hackish way around something that's causing some breaks
Merge pull request #4 from kmjungersen/dev

Dev