Added missing files to commit.
Merge pull request #2 from dadoskbm/master

Accepted FireNG's awesome changes!
Fixed conflicts and generally smoothed over issues stemming from my noobishness.
Fixed some issues >_>
No fireng.
Fixed a whole lotta issues with my local Git setup; updated stuff that I couldn't before.