changed MFers
Merge remote-tracking branch 'remotes/bm/master'

Conflicts:
	views/base
Serve out of /. Add pg and bookshelf to dependencies.
Add necessary dependencies, bookshelf and png
Merge branch 'master' of https://github.com/rektide/snager

Conflicts:
	index.js
	package.json