Merge branch 'hotfix/09062014-replace-mailgun-account'
Merge branch 'release/09062014-adds-newrelic-v52'
add waffle.io badge
Merge pull request #3 from waffle-iron/master

waffle.io Badge
Merge branch 'release/kadira-io-24062014'
remove procfile
Merge branch 'hotfix/remove-procfile' into develop