adding a bunch of shit
Merge remote-tracking branch 'upstream/master'
somehow everhthing got fucked on this end.
getting my master in line with actual master
Merge pull request #155 from sinker/master

getting the masters in line