Merge branch 'hotfix/0.4.1'

* hotfix/0.4.1:
  Keep generated images.
Merge branch 'release/0.5.0'

* release/0.5.0:
  Update install and todos.
  Relative includes and reqiures. Still ugly, though.
  Move gem dependencies into gemspec.
  Specs must use the class now too.
  Public under lib now.
  set folder for views.
  make file executable.
  removing deployment. That will be re-added in a personal branch.
  re-ignoring thumbs dir.
  Moving public into lib.
  moving views into lib.
  moving main file into lib.
  Identation fixed for layout HTML.
  moving HTML into template files.
Merge branch 'release/0.5.1'

* release/0.5.1:
  bump version.
  Add example screenshot and tags.
Merge branch 'release/0.6.0'

* release/0.6.0:
  README to link to tubemp repo.
  Require via bundler
  Not using Rails, clean up Capfile.
  deploy.rb from e835042
  `capify`.
  Add Capistrano for deployment.
  Introduce rackup file.
  Add tubemp gem
  Remove all gem files; turning into wrapper app.
Merge branch 'release/0.6.1'

* release/0.6.1:
  Freeze bundle
  bundle install --deployment
bundle install --deployment
Freeze bundle
Merge branch 'release/0.6.2'

* release/0.6.2:
  repo for cap is now tubemp-site.
  Freeze bundle
  bundle install --deployment
Merge branch 'master' of github.com:berkes/tubemp-site

* 'master' of github.com:berkes/tubemp-site:
Cached version. d'oh.
Merge branch 'release/0.6.3'

* release/0.6.3:
  Cached version. d'oh.
  Update version of tubemp to 0.6.0; 0.5.0 contained a bug.
Consolidate ruby version
Remove local bundled gems. Capistrano will manage them through bundler
Update Gems
Reïnstalled cap with capistrano v3
Merge branch 'hotfix/0.7.0'

* hotfix/0.7.0:
  Reïnstalled cap with capistrano v3
  Update Gems
  Remove local bundled gems. Capistrano will manage them through bundler
  Consolidate ruby version
Merge tag '0.7.0' into develop

capistrano-v3

* tag '0.7.0':
  Reïnstalled cap with capistrano v3
  Update Gems
  Remove local bundled gems. Capistrano will manage them through bundler
  Consolidate ruby version
  Freeze bundle
  bundle install --deployment