Updage gems and some maintenance

- Restore preferred Guardfile behavior
- Remove pointless test w/ deprecated syntax