Many updates.

index.html

@@ -82,17 +82,17 @@
         <p class="answer">For getting to and from work I ride a <a href="http://www.rosebikes.com/bike/rose-pro-dx-cross-3000-hydraulic-817171" target="_blank">Rose Pro DX Cross-3000</a> bike.  It runs with a <a href="http://amzn.to/1Zy3Xx2" target="_blank">Nite Rider Lumina Micro 250 &amp; Solar rear</a> light set and I chose the <a href="http://amzn.to/2a75Iy4" target="_blank">Hiplok V150</a> to lock it up on casual rides.</p>
         <p class="question">And what software?</p>
         <p class="answer">All the Macs run <a href="https://en.wikipedia.org/wiki/OS_X_El_Capitan" target="_blank">El Capitan</a> and content is kept in sync with <a href="http://google.com/drive/" target="_blank">Google Drive</a> and <a href="https://getsync.com/" target="_blank">Resilio</a> (aka BitTorrent Sync) for the more sensitive stuff.  Software installation is <a href="https://github.com/scottwallacesh/dotfiles" target="_blank">scripted</a> which makes setting up new installation a cinch.  I always have an instance of <a href="https://www.iterm2.com/" target="_blank">iTerm2 v3</a>, enhanced with <a href="http://brew.sh/" target="_blank">HomeBrew</a>, running and work wouldn't be the same without <a href="https://www.hipchat.com/" target="_blank">HipChat</a> or <a href="https://hangouts.google.com/">Hangouts</a> (and <a href="https://www.virtualbox.org/" target="_blank">VirtualBox</a> for any Windows nonsense).  <a href="http://www.alfredapp.com/" target="_blank">Alfred 2</a> replaces Spotlight and enables clipboard history -- as well as a host of other functionality (it's great for those who love keyboard shortcuts).  <a href="http://justgetflux.com/" target="_blank">f.lux</a> is a must-have for those who have trouble falling asleep at night.</p>
-        <p class="answer">Photos taken on the phone are automatically uploaded to <a href="https://photos.google.com/" target="_blank">Google Photos</a> and <a href="http://smugmug.com/" target="_blank">SmugMug</a>, which is where all <a href="http://photos.scott.wallace.sh/" target="_blank">my photos</a> are stored, via <a href="https://play.google.com/store/apps/details?id=com.snapwood.smugfolio" target="_blank">their Android app</a>.</p>
+        <p class="answer">Photos taken on the phone are automatically uploaded to <a href="https://photos.google.com/" target="_blank">Google Photos</a>.</p>
-        <p class="answer">Local media is served from the iMac via <a href="https://www.plex.tv/" target="_blank">Plex Server</a> to the Roku.  Keeping the media library up-to-date is tasked to <a href="https://sonarr.tv/" target="_blank">Sonarr</a> and <a href="https://couchpota.to/" target="_blank">Couch Potato</a>.</p>
+        <p class="answer">Local media is served from the iMac via <a href="https://www.plex.tv/" target="_blank">Plex Server</a> to the Roku.  Keeping the media library up-to-date is tasked to <a href="https://sonarr.tv/" target="_blank">Sonarr</a> and <a href="https://radarr.video/" target="_blank">Radarr</a>.</p>
         <p class="answer"><a href="http://www.python.org/" target="_blank">Python</a> is my language of choice but I also dabble in <a href="http://golang.org/" target="_blank">Go</a>, <a href="http://en.wikipedia.org/wiki/C_(programming_language)" target="_blank">C</a>, <a href="http://www.gnu.org/s/bash/" target="_blank">BASH</a> (and Bourne shell), <a href="http://www.php.net/" target="_blank">PHP</a>, and <a href="http://en.wikipedia.org/wiki/Java_(programming_language)" target="_blank">Java</a> (for Android development).  All recent code is kept on <a href="https://github.com/scottwallacesh" target="_blank">GitHub</a>.</p>
-        <p class="answer">My browser of choice is, of course, <a href="http://www.google.com/chrome" target="_blank">Google Chrome</a> loaded with my favourite plugins: 1Password, <a href="https://chrome.google.com/webstore/detail/hangouts/nckgahadagoaajjgafhacjanaoiihapd" target="_blank">Hangouts</a> and <a href="https://chrome.google.com/webstore/detail/save-to-pocket/niloccemoadcdkdjlinkgdfekeahmflj" target="_blank">Pocket</a>.</p>
+        <p class="answer">My browser of choice is, of course, <a href="http://www.google.com/chrome" target="_blank">Google Chrome</a> loaded with my favourite plugins: <a href="https://chrome.google.com/webstore/detail/enpass-password-manager/kmcfomidfpdkfieipokbalgegidffkal" target="_blank">Enpass</a>, <a href="https://chrome.google.com/webstore/detail/hangouts/nckgahadagoaajjgafhacjanaoiihapd" target="_blank">Hangouts</a> and <a href="https://chrome.google.com/webstore/detail/save-to-pocket/niloccemoadcdkdjlinkgdfekeahmflj" target="_blank">Pocket</a>.</p>
-        <p class="answer">I have tried to move my working set of software into the Cloud.  All my website passwords are random and tracked in <a href="https://agilebits.com/onepassword" target="_blank">1Password</a>;  I use either of <a href="http://di.fm">di.fm</a> or <a href="https://play.google.com/music/" target="_blank">Google Play Music</a> for listening to music; <a href="https://apps.google.com/" target="_blank">Google Apps</a> is used for Mail, Calendar, Contacts, Docs and Tasks; and <a href="http://www.getpocket.com/" target="_blank">Pocket</a> for "tl;dr" functionality.</p>
+        <p class="answer">I have tried to move my working set of software into the Cloud.  All my website passwords are random and tracked in <a href="https://www.enpass.io/" target="_blank">Enpass</a>;  I use either of <a href="http://di.fm">di.fm</a> or <a href="https://play.google.com/music/" target="_blank">Google Play Music</a> for listening to music; <a href="https://apps.google.com/" target="_blank">Google Apps</a> is used for Mail, Calendar, Contacts, Docs and Tasks; and <a href="http://www.getpocket.com/" target="_blank">Pocket</a> for "tl;dr" functionality.</p>
         <p class="answer">And last, but certainly not least, <a href="http://fre.ag/3672mfra" target="_blank">FreeAgent</a> helps me out with all the paperwork for my company (invoicing, taxes, timesheets, accounts, etc.).</p>
         <p class="question">What would be your dream setup?</p>
         <p class="answer">A simple, light but fast computer that has access to the Internet from anywhere and acts as a WiFi-hotspot, even when closed.  My mobile phone would be a combination of a <a href="http://en.wikipedia.org/wiki/Personal_area_network" target="_blank">PAN</a>, the laptop and my watch.  All powered with <a href="http://www.pocket-lint.com/news/130380-future-batteries-coming-soon-charge-in-seconds-last-months-and-power-over-the-air" target="_blank">super-futuristic batteries</a> that don't require charging as we know it today..  I'd also really love there to be a single movie and TV streaming service that provided all the world's content to anyone with a subscription and Internet access.</p>
         <p class="answer">I'd also love an adjustable height desk such as the <a href="http://www.geekdesk.com/" target="_blank">Geek Desk</a>.</p>
     </div>
-    <div id="footer">Format taken from <a href="http://usesthis.com/" target="_blank">The Setup</a></div>
+    <div id="footer">Format taken from <a href="http://usesthis.com/" target="_blank">Uses This</a></div>
 </div>
 </body>
 </html>