remove unused stuff, and fix sample settings

- (CallbackURL not CallbackUrl)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/passport.js
	controllers/new_transaction.js
	models/User.js
Merge pull request #14 from mstorus/master

remove unused stuff, and fix sample settings