Merge pull request #39 from ucberkeley/bugFixes

Bug fixes
Fixed scrypt dependencies