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

Conflicts:
	views/base
Serve out of /. Add pg and bookshelf to dependencies.