Merge pull request #16 from eas604/master

Consolidation
Final (I think) push

Fixed some bugs cause by ripping out the DOD stuff.
Merge pull request #23 from TEAM2-ISC567-FALL14/master

bug fix