Merge pull request #93 from ryepdx/master

Fixed 'server not defined' error when passing httpPort command line option
Set up Coinpunk to take an 'env' flag on the command line that allows for switching between different configuration objects in config.json.
tougher check for wallet save
bump the manifest
Merge remote-tracking branch 'kyledrake/master'