pushing changes Fri Dec 13 22:16:12 NZDT 2013
Merge branch 'master' of https://github.com/stormywind/setup