Merge pull request #83 from SteamLUG/master

2014 June Push To Live
Merge branch 'master' into live
Merge branch 'master' into live