Initial Commit
Merge https://github.com/mathewtrivett/twilamp