Added command line options
Added command line options
Merged from master
Now ignoring sublime workspace files