use parcellite to keep various X clipboards in sync
add CN eq hostname or fqdn if available
changed key length to 2048 as recommended by OpenSSL Cookbook and others
adjusted overlays/web2py/etc/apache2/sites-available/web2py
Merge pull request #3 from JedMeister/web2py-bugfix

adjusted overlays/web2py/etc/apache2/sites-available/web2py
Merge pull request #4 from Dude4Linux/update_regen_sslcert

Update regen sslcert
Merge remote-tracking branch 'alon/master'
cronapt: only apply conf if cron-apt is installed
regenerate rails secrets for rails 4.0 and 4.1
Merge pull request #5 from wvengen/feature-rails_secrets

regenerate rails secrets for rails 4.0 and 4.1
Merge remote-tracking branch 'liraz/master'
conf/tomcat: fixed JVM path under i386
Merge remote-tracking branch 'github/master'