adding last few changes
touchups
tweaking conditional pour
removing config
adding gitignore
tidying up
Merge branch 'master' of github.com:phutchins/bitfaucet into maki

Conflicts:
	views/index.jade