Merge pull request #13 from thrownblown/master

sync
Fixed minor errors, pushing to master for deployment
Merge pull request #17 from rawrin/batchOperation

Deployment Ready
Merge branch 'master' of https://github.com/nextup/nextup into scrape