more updates
Merge branch 'master' of http://github.com/jholtom/slash-interface