ported stuff from NoteWTravis
Merge branch 'master' of github.com:timbodude/project_alpha