Fold V2 into Master.

This PR contributes to #242. There have been made some changes to heroku, so @paulbalogh buzz me when you read this.