Merge all the bug fixes.

- roshini's fix
- cleaning up the gem
- fix for snowflake build where the upstart location was wrong.