Double-checking functionality, fixed motd problems
Merge branch 'master' of github.com:pipecork/cpat-spring2013