started vagrant configuration
changes rubygems and github urls to use ssl
added puma to the gemfile
limit projector image width by bounding box
made environment serve assets
try to fix vagrant setup
cleaned up appliance building
Merge branch 'master' into deploy

Conflicts:
	deploy.sh
changed version to 1.7.1
fixes integrated solr server production setup
made sunspot_solr work within appliance