Remove dist and heroku dir
heroku => appfog
Ignore appfog directory
Merge branch 'feature/hack' into develop
Merge branch 'release/0.0.9'