stuff
Merge http://github.com/ajweeks/Circuit
woo