Update for Sat Jul  5 05:46:02 UTC 2014
Merge branch 'master' of github.com:dpfau/eos

Forgot to pull on this end before the cron job ran.
Update for Sat Jul  5 06:41:22 UTC 2014