minor updates
Merge branch 'master' of https://github.com/cylentsystems/our-boxen